mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-01-13 17:16:23 +01:00
Code

- osc diff: if 2 revisions are specified do a pretty_diff (TODO: BSSrcdiff.pm should generate unified diffs)

Browse Source
This commit is contained in:
Marcus Hüwe 2009-01-09 17:09:29 +00:00
parent ee64ab6954
commit 355b6935db
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osc/commandline.py
View File

@ -937,9 +937,9 @@ Please submit there instead, or use --nodevelproject to force direct submission.
@cmdln.option('-r', '--revision', metavar='rev1[:rev2]',
help='If rev1 is specified it will compare your working copy against '
'the revision (rev1) on the server. '
'If rev1 and rev2 are specified it will compare rev1 against rev2'
'(changes in your working copy are ignored in this case).\n'
'NOTE: if more than 1 package is specified --revision will be ignored!')
'If rev1 and rev2 are specified it will compare rev1 against rev2 '
'(NOTE: changes in your working copy are ignored in this case and '
'the resulting diff is NOT unified)')
def do_diff(self, subcmd, opts, *args):
"""${cmd_name}: Generates a diff
@ -958,7 +958,11 @@ Please submit there instead, or use --nodevelproject to force direct submission.
rev1, rev2 = parseRevisionOption(opts.revision)
diff = ''
for pac in pacs:
diff += ''.join(make_diff(pac, rev1))
if not rev2:
diff += ''.join(make_diff(pac, rev1))
else:
diff += pretty_diff(pac.apiurl, pac.prjname, pac.name, rev1,
pac.prjname, pac.name, rev2)
if len(diff) > 0:
print diff