Show More
@@ -48,6 +48,7 b' from mercurial import (' | |||
|
48 | 48 | commands, |
|
49 | 49 | obsolete, |
|
50 | 50 | patch, |
|
51 | pycompat, | |
|
51 | 52 | registrar, |
|
52 | 53 | scmutil, |
|
53 | 54 | util, |
@@ -79,6 +80,7 b" configitem('hgk', 'path'," | |||
|
79 | 80 | inferrepo=True) |
|
80 | 81 | def difftree(ui, repo, node1=None, node2=None, *files, **opts): |
|
81 | 82 | """diff trees from two commits""" |
|
83 | ||
|
82 | 84 | def __difftree(repo, node1, node2, files=None): |
|
83 | 85 | assert node2 is not None |
|
84 | 86 | if files is None: |
@@ -102,7 +104,7 b' def difftree(ui, repo, node1=None, node2' | |||
|
102 | 104 | ## |
|
103 | 105 | |
|
104 | 106 | while True: |
|
105 | if opts['stdin']: | |
|
107 | if opts[r'stdin']: | |
|
106 | 108 | try: |
|
107 | 109 | line = util.bytesinput(ui.fin, ui.fout).split(' ') |
|
108 | 110 | node1 = line[0] |
@@ -118,8 +120,8 b' def difftree(ui, repo, node1=None, node2' | |||
|
118 | 120 | else: |
|
119 | 121 | node2 = node1 |
|
120 | 122 | node1 = repo.changelog.parents(node1)[0] |
|
121 | if opts['patch']: | |
|
122 | if opts['pretty']: | |
|
123 | if opts[r'patch']: | |
|
124 | if opts[r'pretty']: | |
|
123 | 125 | catcommit(ui, repo, node2, "") |
|
124 | 126 | m = scmutil.match(repo[node1], files) |
|
125 | 127 | diffopts = patch.difffeatureopts(ui) |
@@ -130,7 +132,7 b' def difftree(ui, repo, node1=None, node2' | |||
|
130 | 132 | ui.write(chunk) |
|
131 | 133 | else: |
|
132 | 134 | __difftree(repo, node1, node2, files=files) |
|
133 | if not opts['stdin']: | |
|
135 | if not opts[r'stdin']: | |
|
134 | 136 | break |
|
135 | 137 | |
|
136 | 138 | def catcommit(ui, repo, n, prefix, ctx=None): |
@@ -183,7 +185,7 b' def catfile(ui, repo, type=None, r=None,' | |||
|
183 | 185 | # strings |
|
184 | 186 | # |
|
185 | 187 | prefix = "" |
|
186 | if opts['stdin']: | |
|
188 | if opts[r'stdin']: | |
|
187 | 189 | try: |
|
188 | 190 | (type, r) = util.bytesinput(ui.fin, ui.fout).split(' ') |
|
189 | 191 | prefix = " " |
@@ -201,7 +203,7 b' def catfile(ui, repo, type=None, r=None,' | |||
|
201 | 203 | return 1 |
|
202 | 204 | n = repo.lookup(r) |
|
203 | 205 | catcommit(ui, repo, n, prefix) |
|
204 | if opts['stdin']: | |
|
206 | if opts[r'stdin']: | |
|
205 | 207 | try: |
|
206 | 208 | (type, r) = util.bytesinput(ui.fin, ui.fout).split(' ') |
|
207 | 209 | except EOFError: |
@@ -340,7 +342,7 b' def revlist(ui, repo, *revs, **opts):' | |||
|
340 | 342 | else: |
|
341 | 343 | full = None |
|
342 | 344 | copy = [x for x in revs] |
|
343 | revtree(ui, copy, repo, full, opts['max_count'], opts['parents']) | |
|
345 | revtree(ui, copy, repo, full, opts[r'max_count'], opts[r'parents']) | |
|
344 | 346 | |
|
345 | 347 | @command('view', |
|
346 | 348 | [('l', 'limit', '', |
@@ -348,6 +350,7 b' def revlist(ui, repo, *revs, **opts):' | |||
|
348 | 350 | _('[-l LIMIT] [REVRANGE]')) |
|
349 | 351 | def view(ui, repo, *etc, **opts): |
|
350 | 352 | "start interactive history viewer" |
|
353 | opts = pycompat.byteskwargs(opts) | |
|
351 | 354 | os.chdir(repo.root) |
|
352 | 355 | optstr = ' '.join(['--%s %s' % (k, v) for k, v in opts.iteritems() if v]) |
|
353 | 356 | if repo.filtername is None: |
General Comments 0
You need to be logged in to leave comments.
Login now