Commit Graph

5623 Commits

Author SHA1 Message Date
Bryan O'Sullivan
209f13bbaf See if execute bit is honoured when we go back in time 2007-10-26 16:43:13 -07:00
Benoit Boissinot
71b01c9151 merge with -stable 2007-10-26 12:37:59 +02:00
Benoit Boissinot
e8f520a51b patchbomb: fix traceback when diffstat isn't available 2007-10-26 12:01:14 +02:00
Thomas Arendsen Hein
71f1743fa1 merge with crew-stable 2007-10-25 21:37:20 +02:00
Thomas Arendsen Hein
d3c1b2079e Only set mode of new patch if the target file was removed before.
If the file is writable by the user, but owned by a different user, the
chmod will otherwise fail with "Operation not permitted".

Additionally make very sure that the file is only written if either the number
of links is <= 1 or the file was successfully removed.

Maybe this minimal COW code should be replaced by something from util.
2007-10-25 19:40:56 +02:00
Patrick Mezard
11ee3e45e5 Merge with crew-stable 2007-10-25 00:09:13 +02:00
Sebastian Hauer
14709cb72b httprepo: ignore environment proxies when proxies are disabled 2007-10-24 22:15:45 +02:00
Jim Hague
00def4b7ec Fix bdiff test failures on AIX.
The test fails when, in the call to calloc(), the number of elements (bn)
is 0. In that case, calloc() on AIX will return NULL, while the code expects
a valid heap pointer. Both results are permissible under C99, Unix98 etc.

Work around by ensuring that at least 1 element is requested.
2007-10-23 10:39:24 +00:00
Jim Hague
b1341e30d4 fix calloc(0, ...) issue 2007-10-23 10:39:24 +00:00
Matt Mackall
5706b9f949 update: default to tipmost branch if default branch doesn't exist 2007-12-02 15:15:49 -06:00
Matt Mackall
6a1dd997b2 clone: fix race with same target directory (issue716)
Whichever side creates .hg first wins the race, and the other aborts
politely without deleting the tree.
2007-12-02 13:37:30 -06:00
Matt Mackall
4412e65957 backout: disallow across branches (issue655) 2007-12-01 13:09:27 -06:00
Matt Mackall
3c8b7b8583 rename: add test for moving untracked files in directories 2007-12-01 12:54:34 -06:00
Benoit Boissinot
74d4b3eb05 gpg: use the same log message format as hg tag 2007-10-20 03:04:34 +02:00
Matt Mackall
24f4be0cb4 Added signature for changeset 579d076d3e94c0b2efc521d81e47509b5b602020 2007-10-19 18:25:28 -05:00
Christian Ebert
61e3b4ba58 Catch smtp exceptions 2007-09-07 16:48:42 +02:00
Jim Hague
4446a9901a tests: make test-mq-guards work with ksh 2007-10-19 19:20:33 +00:00
Matt Mackall
c9db98f2e6 tests: tidy up reporting of skipped tests
if not verbose:
 - print 's' rather than '.'
 - pass skipped test reports back to parent for -j
 - report which tests were skipped at the end

- print '.' after test completion
2007-10-19 12:53:43 -05:00
Steve Borho
1ddcdfe3e8 Allow explicit disabling of extensions
If the first character of an extension path is '!', the extension
is silently skipped.
2007-09-18 19:53:01 -05:00
NIIMI Satoshi
5043b722ca mq.el: define keymaps as convensions 2007-10-11 06:13:17 +09:00
NIIMI Satoshi
33f14d7efe mercurial.el: mark-marker() returns non-nil with no active mark on GNU Emacs 2007-10-11 06:10:45 +09:00
NIIMI Satoshi
d6fe209c49 mq.el: declare variable mq-top 2007-10-11 06:01:30 +09:00
NIIMI Satoshi
471e00333a mercurial.el, mq.el: remove runtime dependencies on CL package
* (require 'cl) at compile-time

* don't use map()
2007-10-11 05:58:54 +09:00
Georg.Koltermann@mscsoftware.com
0e65b396d5 hgk: colorize commits by authors
Color commits by author. Colors will be assigned to authors by using a configurable list of colors. The line corresponding to current id (the version currently in the working tree) is highlighted in a special font which is also configurable. There is provision to assign fixed colors to authors. See .gitk comment for details.
2007-04-12 13:11:30 +02:00
Bryan O'Sullivan
6a52ab5621 osutil: use fdopendir instead of dirfd 2007-10-15 12:57:01 -07:00
Kirill Smelkov
c46ae95f3f convert: svn -- fix tags handling
They were simply not detected.
2007-10-13 15:25:11 +04:00
Kirill Smelkov
87c2048488 convert: svn -- fix 'exists'
Previously 'exists' erroneously returned False for empty dirictories. This is
wrong since we want to detect even empty 'branches/' or 'tags/'.
2007-10-13 15:22:03 +04:00
Benoit Boissinot
ca7beb1f5e merge with goto 2007-10-12 11:23:03 +02:00
Shun-ichi GOTO
bc6b138bfb mpatch: Define Py_ssize_t for old pythons and use it instead of ssize_t.
See also PEP 353.
NOTE: Microsoft compilers (8 or earlier) does not have ssize_t.
2007-10-12 11:46:49 +09:00
Matt Mackall
f128802dcd mpatch: use int rather than ssize_t
We might need to be more clever than this to make Py2.5 happy.
2007-10-11 17:47:04 -05:00
Matt Mackall
6983b23f64 osutil: improve portability
- manually inline mode_to_kind
- remove unused alloca include
- remove fstatat and associated bits

It's not obvious that there's an advantage to using fstatat in terms
of performance. The race-avoidance properties of fstatat aren't
terribly useful to us either. So best to avoid it until we figure out
how to use it portably.
2007-10-11 17:46:06 -05:00
Benoit Boissinot
30e763291b fix typo 2007-10-11 16:28:30 +02:00
Benoit Boissinot
6e4d069cc4 import gettext since '_' is used 2007-10-11 16:26:14 +02:00
Benoit Boissinot
c5049e31fc explicitely use integer division 2007-10-11 16:19:12 +02:00
Benoit Boissinot
0442ace6c2 fix UnboundLocalError, refactor a bit
bin wasn't defined in all branches (bug introduced in 959d401a1954
2007-10-11 12:16:55 +02:00
Matt Mackall
0c1648fb37 bdiff: tweaks for large files
- adjust the common line threshold to .1%
  this speeds up a delta of 7M lines of source from 10m to 40s
- adjust the scaling of the hash array down a bit as it was raising the peak
  memory usage significantly
2007-10-11 00:46:56 -05:00
Matt Mackall
81a40fb9b2 revlog: break up compression of large deltas
Python's zlib apparently makes an internal copy of strings passed to
compress(). To avoid this, compress strings 1M at a time, then join
them at the end if the result would be smaller than the original.

For initial commits of large but compressible files, this cuts peak
memory usage nearly in half.
2007-10-11 00:46:54 -05:00
Matt Mackall
0804290ab7 revlog: fix caching of buffer objects 2007-10-11 00:46:53 -05:00
Matt Mackall
8a3a3e49fe chunkiter: handle large reads more efficiently
- for large reads, don't attempt to read more than necessary
- if we've gathered the exact number of bytes needed, avoid a string copy
2007-10-11 00:46:52 -05:00
Matt Mackall
9d62709a2c revlog: avoid large yields in group()
Split large yields so that the downstream consumer (chunkbuffer) will avoid
some pain when reading ahead.
2007-10-11 00:46:51 -05:00
Matt Mackall
d3f1e8a8cf chunkiter: simplify iter logic 2007-10-11 00:46:49 -05:00
Matt Mackall
614d4b8b33 chunkbuffer: removed unused method and arg 2007-10-11 00:46:48 -05:00
Matt Mackall
adbffbec3c revlog: reduce memory usage in addgroup
- use a buffer to extract the delta from a chunk
- avoid concatenating to a compressed delta
- use a buffer to directly extra full text from a trivial delta
- delete chunk and delta objects after use
2007-10-11 00:46:47 -05:00
Matt Mackall
507b4b92da mpatch: allow buffer objects for input 2007-10-11 00:46:45 -05:00
Matt Mackall
f666cf65b1 Merge with crew
Those crew folks are getting lazy about pulling from upstream before
committing.
2007-10-11 00:46:40 -05:00
Bryan O'Sullivan
4b4ad223ef test-convert-darcs: don't let $HOME/.darcs pollute the test environment 2007-10-10 15:48:08 -07:00
Bryan O'Sullivan
0ec99ed035 convert: refactor sink initialisation, to remove hardcoding of hg
We also introduce options to explicitly set the source and destination
repository types.

Improve testing of corner cases a little.
2007-10-10 15:42:00 -07:00
Bryan O'Sullivan
1264846224 convert: add default constructor for converter_sink 2007-10-10 15:30:00 -07:00
Bryan O'Sullivan
6df62fb77c convert: make contents of "extra" dict available from sources, for sinks.
This breaks hash preservation for hg->hg conversion, as each converted
change gets a convert_revision item added to its extra dict.  Ugh.
2007-10-10 15:30:00 -07:00
Bryan O'Sullivan
31308e92ec convert: rename convert_svn to svn_source 2007-10-10 15:30:00 -07:00