Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 8259:98acfd1d2b08

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ui: replace regexp pattern with sequence of choices Use ampersands (&) to delineate the response char in each choice. ui.prompt() responses are now explicitly case insensitive. GUIs that subclass ui can generate dialogs from the full choice names.
author Steve Borho <steve@borho.org>
date Thu, 30 Apr 2009 10:15:32 -0500
parents 46293a0c7e9f
children b87a50b7125c
comparison
equal deleted inserted replaced
8258:2263c49af028 8259:98acfd1d2b08
145 return m # unchanged 145 return m # unchanged
146 if m and n: # flags are set but don't agree 146 if m and n: # flags are set but don't agree
147 if not a: # both differ from parent 147 if not a: # both differ from parent
148 r = repo.ui.prompt( 148 r = repo.ui.prompt(
149 _(" conflicting flags for %s\n" 149 _(" conflicting flags for %s\n"
150 "(n)one, e(x)ec or sym(l)ink?") % f, "[nxl]", "n") 150 "(n)one, e(x)ec or sym(l)ink?") % f,
151 return r != "n" and r or '' 151 (_("&None"), _("E&xec"), _("Sym&link")), _("n"))
152 return r != _("n") and r or ''
152 if m == a: 153 if m == a:
153 return n # changed from m to n 154 return n # changed from m to n
154 return m # changed from n to m 155 return m # changed from n to m
155 if m and m != a: # changed from a to m 156 if m and m != a: # changed from a to m
156 return m 157 return m
217 elif f in ma: 218 elif f in ma:
218 if n != ma[f] and not overwrite: 219 if n != ma[f] and not overwrite:
219 if repo.ui.prompt( 220 if repo.ui.prompt(
220 _(" local changed %s which remote deleted\n" 221 _(" local changed %s which remote deleted\n"
221 "use (c)hanged version or (d)elete?") % f, 222 "use (c)hanged version or (d)elete?") % f,
222 _("[cd]"), _("c")) == _("d"): 223 (_("&Changed"), _("&Delete")), _("c")) == _("d"):
223 act("prompt delete", "r", f) 224 act("prompt delete", "r", f)
224 act("prompt keep", "a", f) 225 act("prompt keep", "a", f)
225 else: 226 else:
226 act("other deleted", "r", f) 227 act("other deleted", "r", f)
227 else: 228 else:
252 act("recreating", "g", f, m2.flags(f)) 253 act("recreating", "g", f, m2.flags(f))
253 elif n != ma[f]: 254 elif n != ma[f]:
254 if repo.ui.prompt( 255 if repo.ui.prompt(
255 _("remote changed %s which local deleted\n" 256 _("remote changed %s which local deleted\n"
256 "use (c)hanged version or leave (d)eleted?") % f, 257 "use (c)hanged version or leave (d)eleted?") % f,
257 _("[cd]"), _("c")) == _("c"): 258 (_("&Changed"), _("&Deleted")), _("c")) == _("c"):
258 act("prompt recreating", "g", f, m2.flags(f)) 259 act("prompt recreating", "g", f, m2.flags(f))
259 else: 260 else:
260 act("remote created", "g", f, m2.flags(f)) 261 act("remote created", "g", f, m2.flags(f))
261 262
262 return action 263 return action