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

refactor diff command

Browse Source
This commit is contained in:
Ludwig Nussel 2010-12-23 10:33:31 +01:00
parent 6be91ceda0
commit b1be0f84ea
2 changed files with 37 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
osc/commandline.py
View File

@ -2670,26 +2670,8 @@ Please submit there instead, or use --nodevelproject to force direct submission.
for i in pac.get_diff(rev1): for i in pac.get_diff(rev1):
sys.stdout.write(''.join(i)) sys.stdout.write(''.join(i))
else: else:
try: diff += server_diff_noex(pac.apiurl, pac.prjname, pac.name, rev1,
diff += server_diff(pac.apiurl, pac.prjname, pac.name, rev1,
pac.prjname, pac.name, rev2, not opts.plain, opts.missingok) pac.prjname, pac.name, rev2, not opts.plain, opts.missingok)
except urllib2.HTTPError, e:
if not e.code in [ 400, 403, 404, 500 ]:
raise
msg = None
body = None
try:
body = e.read()
if not 'bad link' in body:
raise e
except:
raise e
diff = "## diff on expanded link not possible, showing unexpanded version\n"
diff += server_diff(pac.apiurl, pac.prjname, pac.name, rev1,
pac.prjname, pac.name, rev2, not opts.plain, opts.missingok,
expand=False)
run_pager(diff) run_pager(diff)
@ -2777,29 +2759,11 @@ Please submit there instead, or use --nodevelproject to force direct submission.
if opts.revision: if opts.revision:
rev1, rev2 = parseRevisionOption(opts.revision) rev1, rev2 = parseRevisionOption(opts.revision)
try: rdiff = server_diff_noex(apiurl,
rdiff = server_diff(apiurl,
old_project, old_package, rev1, old_project, old_package, rev1,
new_project, new_package, rev2, not opts.plain, opts.missingok, new_project, new_package, rev2, not opts.plain, opts.missingok,
expand=not opts.unexpand) expand=not opts.unexpand)
except urllib2.HTTPError, e:
if opts.unexpand or not e.code in [ 400, 403, 404, 500 ]:
raise
msg = None
body = None
try:
body = e.read()
if not 'bad link' in body:
raise e
except:
raise e
rdiff = "## diff on expanded link not possible, showing unexpanded version\n"
rdiff += server_diff(apiurl,
old_project, old_package, rev1,
new_project, new_package, rev2, not opts.plain, opts.missingok,
expand=False)
run_pager(rdiff) run_pager(rdiff)
@cmdln.hide(1) @cmdln.hide(1)

32
osc/core.py
View File

@ -3916,7 +3916,8 @@ def get_source_file_diff(dir, filename, rev, oldfilename = None, olddir = None,
def server_diff(apiurl, def server_diff(apiurl,
old_project, old_package, old_revision, old_project, old_package, old_revision,
new_project, new_package, new_revision, unified=False, missingok=False, meta=False, expand=True): new_project, new_package, new_revision,
unified=False, missingok=False, meta=False, expand=True):
query = {'cmd': 'diff'} query = {'cmd': 'diff'}
if expand: if expand:
query['expand'] = 1 query['expand'] = 1
@ -3940,6 +3941,35 @@ def server_diff(apiurl,
f = http_POST(u) f = http_POST(u)
return f.read() return f.read()
def server_diff_noex(apiurl,
old_project, old_package, old_revision,
new_project, new_package, new_revision,
unified=False, missingok=False, meta=False, expand=True):
print "diff %d\n" % expand
try:
return server_diff(apiurl,
old_project, old_package, old_revision,
new_project, new_package, new_revision,
unified, missingok, meta, expand)
except urllib2.HTTPError, e:
msg = None
body = None
try:
body = e.read()
if not 'bad link' in body:
return '# diff failed: ' + body
except:
return '# diff failed with unknown error'
if expand:
rdiff = "## diff on expanded link not possible, showing unexpanded version\n"
print rdiff
rdiff += server_diff_noex(apiurl,
old_project, old_package, old_revision,
new_project, new_package, new_revision,
unified, missingok, meta, False)
return rdiff
def request_diff(apiurl, reqid): def request_diff(apiurl, reqid):
u = makeurl(apiurl, ['request', reqid], query={'cmd': 'diff'} ) u = makeurl(apiurl, ['request', reqid], query={'cmd': 'diff'} )