Benoit Boissinot
8dfec64301
on revert, only undele files that are removed in the dirstate
2006-02-24 20:25:18 +01:00
Thomas Arendsen Hein
cc4cb4f573
Removed now obsolete min/max check in walkchangerevs().
2006-02-23 22:47:40 +01:00
Thomas Arendsen Hein
ad26220685
Replaced fixed window size for walkchangerevs with an increasing one. Window
...
sizes starts at 8 (for good interactiveness) and doubles with each window
until it is 512, which seems to be the maximum efficient value.
2006-02-23 22:37:29 +01:00
Thomas Arendsen Hein
b21808e452
Fixed wrong (copy&paste) usage of tmpl instead of self.t in hgweb.
2006-02-23 12:35:15 +01:00
Lee Cantey
da24f36b2f
Fix 'hg serve' not using CSS.
...
hgweb.py (templatepath): Return normalized path [fixes later checks in staticfile()]
2006-02-23 12:02:39 +01:00
Benoit Boissinot
b04984b4a2
only write the dirstate when something changed
2006-02-23 02:17:08 +01:00
Thomas Arendsen Hein
73505880b7
Allow serving static files from hgwebdir to fix CSS and favicon.
2006-02-22 09:14:46 +01:00
Thomas Arendsen Hein
43a294292a
Cleanup of tabs and coding when sending content type.
2006-02-22 08:32:51 +01:00
Thomas Arendsen Hein
6e950588da
Merge with mercurial/tonfa
2006-02-22 08:04:46 +01:00
Benoit Boissinot
75ed459311
revalidate revlog data after locking the repo (issue132)
2006-02-22 07:26:29 +01:00
Benoit Boissinot
3f8a6eafb6
merge with matt
2006-02-22 05:21:09 +01:00
Matt Mackall
a318b34fa1
Merge with jeffpc
2006-02-21 17:36:27 -06:00
Benoit Boissinot
1a125a9178
change the default timeout to 600 seconds
2006-02-21 23:50:53 +01:00
Benoit Boissinot
25acc6be22
add a timeout when a lock is held (default 1024 sec)
...
- change the wait keyword from lock.lock to timeout,
a negative timeout of means "wait forever"
- refactor the two lock functions from localrepo.py
- make them use the timeout (default 1024, can be changed
with ui.timeout in the config file
- update the doc
2006-02-21 23:21:15 +01:00
Matt Mackall
6597c90b82
Merge with crew
2006-02-21 15:48:49 -06:00
Benoit Boissinot
3e01c63336
merge with crew
2006-02-21 16:46:38 +01:00
Thomas Arendsen Hein
07effec89b
Merged RSS feed for tags from Peter van Dijk
2006-02-21 16:04:47 +01:00
Thomas Arendsen Hein
afb829966a
hg log --limit shouldn't count unprinted revisions (found by TK Soh)
2006-02-21 15:54:50 +01:00
Thomas Arendsen Hein
9c553aca17
Cleanup: Put initialization of br in front of --branches option handling.
2006-02-21 15:37:23 +01:00
Thomas Arendsen Hein
715ff402e3
Make option --branch vs. --branches more consistent.
...
As you can abbreviate --branches to --branch, old scripts using the long
name will still work.
2006-02-21 13:14:03 +01:00
Thomas Arendsen Hein
18551d6c25
Add option -b/--branch to hg tip (as done for hg parents).
2006-02-21 12:59:16 +01:00
Benoit Boissinot
0cbef7be6f
merge with crew
2006-02-21 08:11:46 +01:00
Benoit Boissinot
c29de9e40e
fix typo in debugrebuildstate
2006-02-21 00:45:02 +01:00
Fabian Otto
bfceaf2339
Sunpro compiler patch
...
The compiling runs through without warning, but runnig the newly builded
hg emmits a message:
| ImportError: ld.so.1: python: fatal: relocation error:
| file /opt/local/lib/python2.3/site-packages/mercurial/bdiff.so:
| symbol cmp: referenced symbol not found
Removing the inline infront of cmp corrects this error message.
2006-02-20 15:58:04 -06:00
Vadim Gelfer
f057fbc44a
merge with crew.
2006-02-20 11:07:09 -08:00
Vadim Gelfer
250a3b7e9d
add -l,--limit to log command.
2006-02-20 11:06:41 -08:00
Benoit Boissinot
aa994e6598
add 'debugrebuildstate' to rebuild the dirstate from a given revision
...
- added and removed files will be lost while recreating the dirstate
- modifications are not lost
2006-02-20 19:04:56 +01:00
Benoit Boissinot
8cab067a5d
use repo.lock when cloning via copy, use lock.LockException when necessary
2006-02-20 01:12:03 +01:00
Benoit Boissinot
6f064de857
Raise a different exception when the lock is not available
...
When the filesystem is read-only or if we have some other
error, there is no need to wait.
Raise a lock.LockUnavailable exception.
2006-02-20 01:09:40 +01:00
Benoit Boissinot
e299b3d857
merge with crew
2006-02-19 22:41:49 +01:00
Benoit Boissinot
c9a333280b
localrepo: refactor the locking functions
2006-02-19 22:39:09 +01:00
Benoit Boissinot
9ea87984bc
fix warnings from pychecker (unused variables and shadowing)
2006-02-19 19:43:03 +01:00
Josef "Jeff" Sipek
e4e3e64918
Merge with mpm
2006-02-18 22:24:42 -05:00
Josef "Jeff" Sipek
4637016376
[hgweb] Static content serving
2006-02-18 21:53:41 -05:00
Robin Farine
cd5d5db3e2
transitive copy/rename
...
Add support for transitive copy or rename operations, e.g.
hg rename a b
... (possibly edit b)
hg rename b c
hg commit ...
by actually renaming "b" as "c" while recording a copy of
"a" to "c" and a removal of "a".
2006-02-18 07:37:59 -08:00
Thomas Arendsen Hein
8d6e52f81a
Fixed misleading indentation in mpatch.c
2006-02-18 16:31:02 +01:00
Thomas Arendsen Hein
a84ba7a30f
Merge with upstream
2006-02-18 06:50:22 +01:00
Thomas Arendsen Hein
d20b168579
Added help string for --daemon-pipefds
2006-02-18 05:40:08 +01:00
Vadim Gelfer
5d27209b37
stop read end of pipe from staying open forever in child process.
2006-02-17 16:32:07 -08:00
Vadim Gelfer
b1dabd957f
add --daemon option to serve command. for issue 45.
...
code looks odd because it is portable to windows. windows does not have
os.fork, so have to spawn and use pipe to tell parent ready instead.
2006-02-17 16:29:30 -08:00
Alexis S. L. Carvalho
739481e8bb
AmbiguousCommand is raised too soon.
...
Right now, hg raises AmbiguousCommand as soon as it finds two
commands/aliases that start with the substring it's searching for, even
though it may still find a full match later on.
This is a bit hard to hit on purpose, because hg checks the list of
commands in whatever order is returned by table.keys(), which will
change when you add an alias to a command. You should be able to hit it
by adding an alias "u" to the "identify" command - not that that makes a
lot of sense...
2006-02-17 17:41:23 -06:00
Matt Mackall
45afdee653
Merge with crew
2006-02-17 17:39:05 -06:00
Matt Mackall
a9543f526c
Refactor excessive merge detection, add test
2006-02-17 17:23:53 -06:00
Vadim Gelfer
d1f78f49f0
add preoutgoing and outgoing hooks.
...
preoutgoing lets prevent pull over http or ssh.
outgoing lets notify after pull.
2006-02-17 08:26:21 -08:00
Vadim Gelfer
b843092d88
tests for new hooks. fix things i found when writing tests.
2006-02-16 09:56:31 -08:00
Vadim Gelfer
e6a0476599
merge with crew.
2006-02-16 08:51:24 -08:00
Vadim Gelfer
31409d2048
fix names of parent changeset ids in hooks.
...
fix hook part of man page.
2006-02-16 08:48:31 -08:00
Vadim Gelfer
db9761a152
prefix hook env var names with HG_.
...
old names are still provided, but doc says they deprecated.
2006-02-16 08:40:47 -08:00
Benoit Boissinot
a0fcd1a0bc
merge with crew
2006-02-15 22:37:28 +01:00
Benoit Boissinot
6dcaf620ac
add a -b/--branch option to 'hg parents'
2006-02-15 22:21:20 +01:00
