Mercurial > hg > mercurial-crew-with-dirclash
annotate mercurial/i18n.py @ 5045:f191bc3916f7
merge: do early copy to deal with issue636
Without copies/renames, merges source names are 1:1 with their
targets. Copies and renames introduce the possibility that there will
be two merges with the same input but different output. By doing the
copy to the destination name before the merge, the actual merge
becomes 1:1 again, and no source is the input to two different merges.
- add a preliminary scan to applyupdates to do copies
- for the merge action, pass the old name (for finding ancestors) and
the new name (for input to the merge) to filemerge
- eliminate the old post-merge copy
- lookup file contents from new name in filemerge
- pass new name to external merge helper
- report merge failure at new name
- add a test
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 01 Aug 2007 12:33:12 -0500 |
parents | 660504812daf |
children |
rev | line source |
---|---|
1400
cf9a1233738a
i18n first part: make '_' available for files who need it
Benoit Boissinot <benoit.boissinot@ens-lyon.org
parents:
diff
changeset
|
1 """ |
cf9a1233738a
i18n first part: make '_' available for files who need it
Benoit Boissinot <benoit.boissinot@ens-lyon.org
parents:
diff
changeset
|
2 i18n.py - internationalization support for mercurial |
cf9a1233738a
i18n first part: make '_' available for files who need it
Benoit Boissinot <benoit.boissinot@ens-lyon.org
parents:
diff
changeset
|
3 |
2858 | 4 Copyright 2005, 2006 Matt Mackall <mpm@selenic.com> |
1400
cf9a1233738a
i18n first part: make '_' available for files who need it
Benoit Boissinot <benoit.boissinot@ens-lyon.org
parents:
diff
changeset
|
5 |
cf9a1233738a
i18n first part: make '_' available for files who need it
Benoit Boissinot <benoit.boissinot@ens-lyon.org
parents:
diff
changeset
|
6 This software may be used and distributed according to the terms |
cf9a1233738a
i18n first part: make '_' available for files who need it
Benoit Boissinot <benoit.boissinot@ens-lyon.org
parents:
diff
changeset
|
7 of the GNU General Public License, incorporated herein by reference. |
cf9a1233738a
i18n first part: make '_' available for files who need it
Benoit Boissinot <benoit.boissinot@ens-lyon.org
parents:
diff
changeset
|
8 """ |
cf9a1233738a
i18n first part: make '_' available for files who need it
Benoit Boissinot <benoit.boissinot@ens-lyon.org
parents:
diff
changeset
|
9 |
3890
660504812daf
Enable gettext translations
Matt Mackall <mpm@selenic.com>
parents:
2858
diff
changeset
|
10 import gettext |
660504812daf
Enable gettext translations
Matt Mackall <mpm@selenic.com>
parents:
2858
diff
changeset
|
11 t = gettext.translation('hg', fallback=1) |
660504812daf
Enable gettext translations
Matt Mackall <mpm@selenic.com>
parents:
2858
diff
changeset
|
12 gettext = t.gettext |
660504812daf
Enable gettext translations
Matt Mackall <mpm@selenic.com>
parents:
2858
diff
changeset
|
13 _ = gettext |