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