John Coomes
5c790a2f5f
hg tag: run tag hook just once
2007-12-18 12:45:30 -08:00
Christian Ebert
f996d70387
patchbomb: break lines > 80 chars (coding style)
2007-12-18 22:50:27 +01:00
Matt Mackall
c29af0c762
changelog: inline trivial call for extra data unescaping
2007-12-27 23:55:40 -06:00
Matt Mackall
295be4678d
changelog: remove extract function
2007-12-27 23:55:40 -06:00
Matt Mackall
c9efd52e9e
util: simplify unique
2007-12-27 23:55:40 -06:00
Matt Mackall
50455803c5
remove unused util.localsub function
2007-12-27 23:55:40 -06:00
Matt Mackall
3d2020e6ca
add debugfsinfo to check fs capabilities
2007-12-27 23:55:40 -06:00
Matt Mackall
1baaf41264
atomictempfile: avoid chmod weirdness on Linux vfat
2007-12-27 23:55:40 -06:00
Matt Mackall
bdea7ebd1b
checkexec: fix VFAT tempfile droppings with more modern Linux kernels
...
More recent Linux kernels don't pretend to allow any bogus chmods on
VFAT.
2007-12-27 23:55:40 -06:00
Matt Mackall
efd0dc7e97
bisect: use proper locking when updating bisect.state
2007-12-27 23:55:40 -06:00
Matt Mackall
2c1d9d3334
bisect: remove class
...
- rename core function to _bisect
- rename command function to bisect
- move state management to bisect
2007-12-27 23:55:40 -06:00
Matt Mackall
4374a62a6f
bisect: keep history of all bad revisions
...
- use a single state dict
- find the minimum bad revision
2007-12-27 23:55:40 -06:00
Matt Mackall
98edd8fe9d
bisect: use more standard command syntax and help
2007-12-27 23:55:40 -06:00
Matt Mackall
20c9eec942
bisect: move reporting out of core bisect function
2007-12-27 23:55:40 -06:00
Matt Mackall
c2150b8bfe
bisect: add skip command
...
- read/write skip lines in state
- skip candidates in skipnodes
- move bisect begin logic to next
- add skip command
2007-12-27 23:55:40 -06:00
Matt Mackall
7caa218038
bisect: simplify state handling and init
...
- use a single bisect.state file
- unify init and reset (delete the state)
- move write into good/bad
2007-12-27 23:55:39 -06:00
Matt Mackall
b3662ecbfa
bisect: remove unused imports
2007-12-27 23:55:39 -06:00
Matt Mackall
6b799c897d
bisect: rename autobad/good/next
2007-12-27 23:55:39 -06:00
Matt Mackall
f29636dd67
bisect: slightly improve the help message
2007-12-27 23:55:39 -06:00
Matt Mackall
17063dc6f6
bisect: remove stale test function
2007-12-27 23:55:39 -06:00
Matt Mackall
98e6b1c3b6
bisect: use array.array rather than lists for ancestor lists
...
This nearly doubles performance and cuts memory usage in half on large
bisections.
2007-12-27 23:55:39 -06:00
Matt Mackall
762fb16074
bisect: switch individual ancestor lists from dict to list
...
This saves quite a lot of memory and increases performance
2007-12-27 23:55:39 -06:00
Matt Mackall
cff52b93cb
bisect: turn ancestors into an array
...
This makes things faster and eliminates the separate stop hash
2007-12-27 23:55:39 -06:00
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
