equal
deleted
inserted
replaced
8 # of the GNU General Public License, incorporated herein by reference. |
8 # of the GNU General Public License, incorporated herein by reference. |
9 |
9 |
10 import time, sys, signal |
10 import time, sys, signal |
11 from mercurial import hg, mdiff, fancyopts, commands, ui |
11 from mercurial import hg, mdiff, fancyopts, commands, ui |
12 |
12 |
13 def difftree(args, repo): |
13 def difftree(args, ui, repo): |
14 def __difftree(repo, files = None, node1 = None, node2 = None): |
14 def __difftree(repo, files = None, node1 = None, node2 = None): |
15 def date(c): |
15 def date(c): |
16 return time.asctime(time.gmtime(float(c[2].split(' ')[0]))) |
16 return time.asctime(time.gmtime(float(c[2].split(' ')[0]))) |
17 |
17 |
18 if node2: |
18 if node2: |
59 sys.exit(1) |
59 sys.exit(1) |
60 revs.append(repo.lookup(args[0])) |
60 revs.append(repo.lookup(args[0])) |
61 revs.append(repo.lookup(args[1])) |
61 revs.append(repo.lookup(args[1])) |
62 args = args[2:] |
62 args = args[2:] |
63 if doptions['patch']: |
63 if doptions['patch']: |
64 commands.dodiff(repo, "", args, *revs) |
64 commands.dodiff(ui, repo, "", args, *revs) |
65 else: |
65 else: |
66 __difftree(repo, args, *revs) |
66 __difftree(repo, args, *revs) |
67 |
67 |
68 def catcommit(repo, n, prefix): |
68 def catcommit(repo, n, prefix): |
69 nlprefix = '\n' + prefix; |
69 nlprefix = '\n' + prefix; |
234 u = ui.ui() |
234 u = ui.ui() |
235 signal.signal(signal.SIGTERM, catchterm) |
235 signal.signal(signal.SIGTERM, catchterm) |
236 repo = hg.repository(ui = u) |
236 repo = hg.repository(ui = u) |
237 |
237 |
238 if cmd == "diff-tree": |
238 if cmd == "diff-tree": |
239 difftree(args, repo) |
239 difftree(args, u, repo) |
240 |
240 |
241 elif cmd == "cat-file": |
241 elif cmd == "cat-file": |
242 catfile(args, ui, repo) |
242 catfile(args, u, repo) |
243 |
243 |
244 elif cmd == "rev-tree": |
244 elif cmd == "rev-tree": |
245 revtree(args, repo) |
245 revtree(args, repo) |
246 |
246 |
247 elif cmd == "rev-list": |
247 elif cmd == "rev-list": |