Martin von Zweigbergk 1932d029e7 merge: move cd/dc prompts after largefiles prompts ... By moving the cd/dc prompts out of calculateupdates(), we let largefiles' overridecalculateupdates() so the unresolved values (i.e. 'cd' or 'dc' rather than 'g', 'r', 'a' and missing). This allows overridecalculateupdates() to ask the user whether to keep the normal file or the largefile before the user gets the cd/dc prompt. Whichever answer the user gives, we make overridecalculateupdates() replace 'cd' or 'dc' action, saving the user one annoying (and less clear) question.		2014-12-11 21:21:21 -08:00
..
convert	convert: use git diff-tree -Cn% instead of --find-copies=n% for older git	2014-11-06 09:36:39 +01:00
highlight	check-code: check for spaces around = for named parameters	2013-10-03 14:50:47 +02:00
largefiles	merge: move cd/dc prompts after largefiles prompts	2014-12-11 21:21:21 -08:00
zeroconf	zeroconf: use port from server instead of picking port from config (issue3746)	2012-12-30 19:19:52 +01:00
__init__.py	Re-add hgext/__init__.py	2005-09-29 12:49:01 -07:00
acl.py	check-code: check for spaces around = for named parameters	2013-10-03 14:50:47 +02:00
blackbox.py	blackbox: fix blackbox causing exceptions in tests	2013-05-22 17:38:24 -07:00
bugzilla.py	bugzilla: correct config documentation error	2014-07-03 10:56:03 +01:00
children.py	children: define inferrepo in command decorator	2014-05-04 22:25:28 -07:00
churn.py	doc: change 'revision or range' to 'revision or revset'	2014-10-24 13:50:00 -04:00
color.py	patchbomb: add label and color to the confirm output	2014-11-04 13:38:33 +00:00
eol.py	eol: fix crash when handling removed files	2014-10-22 16:10:23 +02:00
extdiff.py	util.system: use ui.system() in place of optional ui.fout parameter	2014-11-08 13:06:22 +09:00
factotum.py	factotum: convert Plan 9 quoted string to Python string	2014-11-25 02:31:52 -06:00
fetch.py	fetch: use exchange.pull	2014-10-03 11:16:57 -05:00
gpg.py	gpg: use an abort hint and don't mention --force	2014-10-02 18:50:41 -05:00
graphlog.py	doc: change 'revision or range' to 'revision or revset'	2014-10-24 13:50:00 -04:00
hgcia.py	hgcia: access status fields by name rather than index	2014-10-03 09:51:39 -07:00
hgk.py	hgk: don't honor whitespace and format-changing diffopts	2014-11-18 21:38:19 -08:00
histedit.py	histedit: miscellaneous style cleanups	2014-10-16 14:55:45 -04:00
keyword.py	keyword: use parent of working copy as base for status	2014-10-23 13:17:37 -07:00
mq.py	mq: fix update of headers that occur in the "wrong" order	2014-11-28 02:57:33 +01:00
notify.py	notify: explicitly honor all diffopts	2014-11-18 21:47:47 -08:00
pager.py	pager: add attend-<command> option	2014-05-09 13:32:56 -05:00
patchbomb.py	patchbomb: introduce a 'patchbomb.confirm' option	2014-12-02 17:35:21 -08:00
progress.py	progress: use 'encoding.colwidth' to get column width of items correctly	2014-07-06 02:56:41 +09:00
purge.py	purge: access status fields by name rather than index	2014-10-03 10:38:43 -07:00
rebase.py	rebase: improve debug messages while processing the list of rebases	2014-12-10 06:20:35 +01:00
record.py	record: don't honor format-changing diffopts (issue4459)	2014-11-18 20:00:37 -08:00
relink.py	relink: declare command using decorator	2014-05-04 21:52:25 -07:00
schemes.py	scheme: don't crash on invalid URLs	2013-04-11 14:41:22 +02:00
share.py	share: define norepo in command decorator	2014-05-04 22:03:11 -07:00
shelve.py	shelve: access status fields by name rather than index	2014-10-03 22:12:43 -07:00
strip.py	strip: make checklocalchanges() return full status tuple	2014-10-04 20:53:05 -07:00
transplant.py	transplant: don't honor whitespace and format-changing diffopts	2014-11-18 21:49:05 -08:00
win32mbcs.py	win32mbcs: wrap util.split()	2013-07-04 23:05:59 +09:00
win32text.py	extensions: mark win32text deprecated	2014-03-01 19:51:22 -06:00