Matt Mackall
982653f2a9
bisect: greatly simplify the ancestor accumulating loop
2007-12-27 23:55:39 -06:00
Matt Mackall
36a17eda66
bisect: switch to rev-based calculation
...
- use revlog.parentrevs in search loops
- calculate stop directly in O(N) without reachable
- move badrev check into candidates
2007-12-27 23:55:39 -06:00
Matt Mackall
054559c4a9
bisect: fix up node vs rev naming
2007-12-27 23:55:39 -06:00
Matt Mackall
4a341be5b9
bisect: clarify some bisection code
...
- rename __ancestors... to candidates
- remove head parameter (it's always badrev)
- eliminate comprehensions to shrink parents
- num_ancestors -> n_child name fix
- clarify node selection
2007-12-27 23:55:39 -06:00
Matt Mackall
2c21ad57e0
bisect: inline num_children function
2007-12-27 23:55:39 -06:00
Matt Mackall
c433182f43
bisect: remove usage of sets
2007-12-27 23:55:39 -06:00
Matt Mackall
8431bfff31
bisect: remove stop argument to ancestors function
2007-12-27 23:55:39 -06:00
Matt Mackall
013ac03708
bisect: use bail_if_changed
...
- switch to using existing bail_if_changed code
- only abort when we're about to do an update
2007-12-27 23:55:39 -06:00
Matt Mackall
c205c57746
cmdutil: make bail_if_changed bail on uncommitted merge
2007-12-27 23:55:39 -06:00
Matt Mackall
b5e59bd04e
bisect: remove versionstr
2007-12-27 23:55:39 -06:00
Matt Mackall
b749d30f61
bisect: simplify lookup
...
- use repo.lookup directly
- move merge check to check_clean
2007-12-27 23:55:39 -06:00
Matt Mackall
2655c790b8
bisect: remove redundant clean checks
2007-12-27 23:55:39 -06:00
Matt Mackall
9441f83422
bisect: fold in two trivial functions
2007-12-27 23:55:39 -06:00
Matt Mackall
4ea69c713d
bisect: remove two unused functions
2007-12-27 23:55:39 -06:00
Matt Mackall
5fef1977f2
update test-merge-types
2007-12-27 23:55:36 -06:00
Matt Mackall
faa2e2041c
ui: allow default when prompting
2007-12-27 22:49:01 -06:00
Matt Mackall
c7663b5b00
merge: add flag merging intelligence
...
- properly handle all 27 combinations of flags
- prompt on conflicts
2007-12-27 22:47:44 -06:00
Matt Mackall
614e20b215
util: remove set_exec and set_link methods
2007-12-27 22:47:41 -06:00
Matt Mackall
f21286882c
patch: use util.set_flags
2007-12-27 22:29:21 -06:00
Matt Mackall
ab5d78ce60
convert/svn: use util.set_flags
2007-12-27 22:29:17 -06:00
Matt Mackall
d9e4ee2c04
merge: use util.set_flags
2007-12-27 22:27:48 -06:00
Matt Mackall
49c18f282e
wwrite: simplify with util.set_flags
...
- always attempt to delete the file (gets rid of read-only message)
- always write as a normal file
- use set_flags to convert to link or set exec
2007-12-27 22:27:47 -06:00
Matt Mackall
717ff7e6f8
util: add new set_flags method
...
This is more efficient than calling set_link and set_exec
2007-12-27 22:27:45 -06:00
Matt Mackall
2af988f28f
add --debug to test-merge-types
2007-12-27 22:27:43 -06:00
Matt Mackall
7edaa19dd3
merge: simplify merge tests, fix exec flag bug
...
If local changed exec bit and remote changed file contents, exec bit
change would be lost.
2007-12-27 22:27:37 -06:00
Peter Arrenbrecht
18fb9f5e5e
Fix income/pull with bundle and -R (issue 820).
...
Uses ui.setconfig() to tell bundlerepo where the main repo is. This is
needed for when the --repository option is used.
Adds tests to test-bundle and a new test script
test-mq-pull-from-bundle, which plays out the situation that initially
made me detect this bug
(hg -R .hg/patches pull ../bundle.hg).
2007-12-18 14:11:13 -06:00
Patrick Mezard
0661d4b997
patch: simplify directory creation
2007-12-17 23:42:48 +01:00
Patrick Mezard
1fb759fad1
patch: write rej files for missing targets (issue 853)
2007-12-17 23:42:46 +01:00
Patrick Mezard
29045b226b
patch: avoid file existence tests when possible in selectfile()
2007-12-17 23:06:04 +01:00
Patrick Mezard
c43b58242b
patch: move diff parsing in iterhunks generator
2007-12-17 23:06:01 +01:00
Patrick Mezard
b4f670a426
patch: move NoHunk detection up with parsing code
2007-12-17 22:19:21 +01:00
Thomas Arendsen Hein
bb8be03dba
merge with main
2007-12-17 13:45:30 +01:00
Christian Ebert
69c7eeabfc
patchbomb: make "hg email -b" w/o destination work as advertised
2007-12-16 22:55:23 +01:00
Christian Ebert
27cd5a7001
patchbomb: make "hg email -b" w/o destination work as advertised
2007-12-16 22:55:23 +01:00
Shun-ichi GOTO
903870798f
Workaround for "Not enough space" error due to the bug of Windows.
...
Large write requests fail when stdout is switched to binary mode.
As a workaround, limit the data size to write once.
2007-12-14 16:47:41 +01:00
Steve Borho
dafb712d34
fix typo in sshargs
...
the original typo dated back to early 2005
2007-12-13 14:25:51 -06:00
Peter Arrenbrecht
977c33f8b5
mq: drop obsolete reference to 'qversion'
2007-12-13 20:35:42 +01:00
Steve Borho
caa5fee772
win32: fix ssh://host:port when using Plink
...
Moves ssh argument building to platform specific utils code.
The win32 version looks for plink in ssh command string and
uses '-P' in lieu of '-p' for specifying a port
2007-12-12 16:44:26 -06:00
Lee Cantey
4f90d32027
Default to 10.5 version using the default python 2.5
2007-12-10 14:54:41 -08:00
Patrick Mezard
783aa75f49
patchbomb: prompt with ui.prompt()
...
Avoid Windows raw_input() issue introduced by 0f20f68c768c.
Found by Steve Borho <steve@borho.org>.
2007-12-10 22:41:18 +01:00
Matt Mackall
912ed4360f
ignore: fix up comment parsing
...
- remove redundant newline bits
- change loop to use regex
- eliminate escaping of # in internal representation
2007-12-10 10:26:42 -06:00
Matt Mackall
f200ad645a
demandload: give better diagnostic for call of an unloaded module
2007-12-10 10:24:47 -06:00
Matt Mackall
f72837d93d
fancyopts: lots of cleanups
2007-12-10 10:24:36 -06:00
Matt Mackall
1c590a3f47
commit: avoid losing edits during commit
...
If a file is edited between the time we record file states in the repo
and update the dirstate, that change can be lost to hg status. Because
we invoke the editor between these two points, that window can be
arbitrarily large.
This greatly shrinks the window by recording the commit change
immediately. If our checkin fails, we simply invalidate the dirstate.
2007-12-10 10:24:29 -06:00
Matt Mackall
964d06fc69
rm: complain more about removing added files
2007-12-10 10:24:21 -06:00
Matt Mackall
ad0a02c7c8
merge: make return codes more sensible
...
Commands that call merge were exiting with a return code equal to the
number of unresolved files. We now return 1 if there are unresolved
files.
2007-12-10 10:24:14 -06:00
Matt Mackall
a172f3448b
doc: correct preoutgoing description
2007-12-10 10:23:56 -06:00
Matt Mackall
2b6b8e4e67
dispatch: report OOM rather than traceback
2007-12-10 10:23:45 -06:00
Patrick Mezard
847791ee22
Merge with crew-stable
2007-12-09 20:46:32 +01:00
Patrick Mezard
9760500b06
convert: move commands definition to ease demandload job (issue 860)
2007-12-09 15:25:36 +01:00
