equal
deleted
inserted
replaced
9 # Aliases map file format is simple one alias per line in the following |
9 # Aliases map file format is simple one alias per line in the following |
10 # format: |
10 # format: |
11 # |
11 # |
12 # <alias email> <actual email> |
12 # <alias email> <actual email> |
13 |
13 |
14 import time, sys, signal, os |
14 import sys |
15 from mercurial.i18n import gettext as _ |
15 from mercurial.i18n import gettext as _ |
16 from mercurial import hg, mdiff, cmdutil, ui, util, templater, node |
16 from mercurial import hg, mdiff, cmdutil, ui, util, templater, node |
17 |
17 |
18 def __gather(ui, repo, node1, node2): |
18 def __gather(ui, repo, node1, node2): |
19 def dirtywork(f, mmap1, mmap2): |
19 def dirtywork(f, mmap1, mmap2): |