@@ -46,7 +46,7 Output example of rhmanifest:: | |||||
46 | </rhmanifest> |
|
46 | </rhmanifest> | |
47 | """ |
|
47 | """ | |
48 | import re, time, cgi, urllib |
|
48 | import re, time, cgi, urllib | |
49 | from mercurial import cmdutil, commands, node, error |
|
49 | from mercurial import cmdutil, commands, node, error, hg | |
50 |
|
50 | |||
51 | _x = cgi.escape |
|
51 | _x = cgi.escape | |
52 | _u = lambda s: cgi.escape(urllib.quote(s)) |
|
52 | _u = lambda s: cgi.escape(urllib.quote(s)) | |
@@ -146,7 +146,10 def rhlog(ui, repo, *pats, **opts): | |||||
146 | bra = urllib.unquote_plus(opts.pop('rhbranch', None)) |
|
146 | bra = urllib.unquote_plus(opts.pop('rhbranch', None)) | |
147 | from_rev = from_rev.replace('"', '\\"') |
|
147 | from_rev = from_rev.replace('"', '\\"') | |
148 | to_rev = to_rev.replace('"', '\\"') |
|
148 | to_rev = to_rev.replace('"', '\\"') | |
149 | opts['rev'] = ['"%s":"%s"' % (from_rev, to_rev)] |
|
149 | if hg.util.version() >= '1.6': | |
|
150 | opts['rev'] = ['"%s":"%s"' % (from_rev, to_rev)] | |||
|
151 | else: | |||
|
152 | opts['rev'] = ['%s:%s' % (from_rev, to_rev)] | |||
150 | opts['branch'] = [bra] |
|
153 | opts['branch'] = [bra] | |
151 | return commands.log(ui, repo, *map(urllib.unquote_plus, pats), **opts) |
|
154 | return commands.log(ui, repo, *map(urllib.unquote_plus, pats), **opts) | |
152 |
|
155 |
General Comments 0
You need to be logged in to leave comments.
Login now