Mercurial > public > mercurial-scm > hg

comparison mercurial/subrepo.py @ 8908:105343f9f744

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix warning: Seen unexpected token "%"
author Dongsheng Song <dongsheng.song@gmail.com>
date Fri, 19 Jun 2009 14:28:29 +0800
parents e87b0fc4750b
children 70f5d3be5917
comparison
equal deleted inserted replaced
8831:91e26fb24fb1 8908:105343f9f744
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.prompt(
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')), _('l')) == _('r'):
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
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.prompt(
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')), _('c')) == _('d'):
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
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.prompt(
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')), _('c')) == _('c'):
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)