Mercurial > public > mercurial-scm > hg

comparison mercurial/subrepo.py @ 9048:86b4a9b0ddda

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ui: extract choice from prompt avoid translating single characters (as l for _local or sym_link)
author Simon Heimberg <simohe@besonet.ch>
date Sun, 21 Jun 2009 01:13:19 +0200
parents 70f5d3be5917
children 38b5d5e0efab
comparison
equal deleted inserted replaced
9047:8263d98ffb1c 9048:86b4a9b0ddda
61 continue 61 continue
62 elif l == a: # other side changed 62 elif l == a: # other side changed
63 wctx.sub(s).get(r) 63 wctx.sub(s).get(r)
64 sm[s] = r 64 sm[s] = r
65 elif l[0] != r[0]: # sources differ 65 elif l[0] != r[0]: # sources differ
66 if repo.ui.prompt( 66 if repo.ui.promptchoice(
67 _(' subrepository sources for %s differ\n' 67 _(' subrepository sources for %s differ\n'
68 'use (l)ocal source (%s) or (r)emote source (%s)?') 68 'use (l)ocal source (%s) or (r)emote source (%s)?')
69 % (s, l[0], r[0]), 69 % (s, l[0], r[0]),
70 (_('&Local'), _('&Remote')), _('l')) == _('r'): 70 (_('&Local'), _('&Remote')), 0):
71 wctx.sub(s).get(r) 71 wctx.sub(s).get(r)
72 sm[s] = r 72 sm[s] = r
73 elif l[1] == a[1]: # local side is unchanged 73 elif l[1] == a[1]: # local side is unchanged
74 wctx.sub(s).get(r) 74 wctx.sub(s).get(r)
75 sm[s] = r 75 sm[s] = r
77 wctx.sub(s).merge(r) 77 wctx.sub(s).merge(r)
78 sm[s] = l 78 sm[s] = l
79 elif l == a: # remote removed, local unchanged 79 elif l == a: # remote removed, local unchanged
80 wctx.sub(s).remove() 80 wctx.sub(s).remove()
81 else: 81 else:
82 if repo.ui.prompt( 82 if repo.ui.promptchoice(
83 _(' local changed subrepository %s which remote removed\n' 83 _(' local changed subrepository %s which remote removed\n'
84 'use (c)hanged version or (d)elete?') % s, 84 'use (c)hanged version or (d)elete?') % s,
85 (_('&Changed'), _('&Delete')), _('c')) == _('d'): 85 (_('&Changed'), _('&Delete')), 0):
86 wctx.sub(s).remove() 86 wctx.sub(s).remove()
87 87
88 for s, r in s2.items(): 88 for s, r in s2.items():
89 if s in s1: 89 if s in s1:
90 continue 90 continue
91 elif s not in sa: 91 elif s not in sa:
92 wctx.sub(s).get(r) 92 wctx.sub(s).get(r)
93 sm[s] = r 93 sm[s] = r
94 elif r != sa[s]: 94 elif r != sa[s]:
95 if repo.ui.prompt( 95 if repo.ui.promptchoice(
96 _(' remote changed subrepository %s which local removed\n' 96 _(' remote changed subrepository %s which local removed\n'
97 'use (c)hanged version or (d)elete?') % s, 97 'use (c)hanged version or (d)elete?') % s,
98 (_('&Changed'), _('&Delete')), _('c')) == _('c'): 98 (_('&Changed'), _('&Delete')), 0) == 0:
99 wctx.sub(s).get(r) 99 wctx.sub(s).get(r)
100 sm[s] = r 100 sm[s] = r
101 101
102 # record merged .hgsubstate 102 # record merged .hgsubstate
103 writestate(repo, sm) 103 writestate(repo, sm)