Commit Graph

6431 Commits

Author SHA1 Message Date
Dirkjan Ochtman
2778ac21ea improved semantics for remove (issue438)
- Added files are never deleted (only removed with --force).
- Modified files can only be removed with --force.
- With --after, only deleted files are removed.
- With --after --force, all files are removed but not deleted.
2008-03-22 10:07:49 +01:00
Matt Mackall
a3c45346bb test: fix mixing exec bit on test-hgwebdirsym 2008-03-21 17:22:47 -05:00
Matt Mackall
16115cc42c tests: make test-rebuildstate repeatable 2008-03-21 15:57:22 -05:00
Matt Mackall
f9e70fb40e tests: teach -i about fails list 2008-03-21 15:57:22 -05:00
Matt Mackall
647da75fbe tests: make test-convertcvs repeatable 2008-03-21 15:57:22 -05:00
Eric Hopper
c1929a9601 test: Add tests for webdir symlinks and walkrepos. 2008-03-21 08:46:15 -07:00
Matt Mackall
dc1cdafff7 mq: warn when applying a patch to somewhere other than tip 2008-03-21 15:44:11 -05:00
Patrick Mezard
a8a4885e0a util: check fileno() validity in win32 set_binary() 2008-03-21 21:56:55 +01:00
Adrian Buehlmann
153675561e clone: print "updating working directory" status message
With this change, "hg clone" looks like this:

% hg clone http://example.com/repo/big big
requesting all changes
adding changesets
adding manifests
adding file changes
added XXX changesets with XXX changes to XXX files
updating working directory
XXX files updated, XXX files merged, XXX files removed, XXX files unresolved

So the user sees

% hg clone http://example.com/repo/big big
requesting all changes
adding changesets
adding manifests
adding file changes
added XXX changesets with XXX changes to XXX files
updating working directory

while Mercurial is writing to disk to populate the working directory

With this change, "hg clone" looks like this:

% hg clone big big-work
updating working directory
XXX files updated, XXX files merged, XXX files removed, XXX files unresolved
2008-03-21 14:52:24 +01:00
Dirkjan Ochtman
c9f3b5991c give better error message on non-existent mapfile (issue813) 2008-03-21 12:05:01 +01:00
Dirkjan Ochtman
3e3b0d62eb warn about new heads on commit (issue842) 2008-03-21 11:06:02 +01:00
Dirkjan Ochtman
d049a05886 hgweb: only accept POST requests for unbundle 2008-03-21 00:55:53 +01:00
Thomas Arendsen Hein
f0f68949d5 tab/space cleanup 2008-03-21 00:39:39 +01:00
Dirkjan Ochtman
ade2841b93 ui: copy overlay from both direct and indirect parentui 2008-03-20 22:46:35 +01:00
Patrick Mezard
df0cbbb71a convert: allow missing tools not to stop source type detection 2008-03-20 23:32:43 +01:00
Dirkjan Ochtman
187ae17c7e fix test-serve breakage for other hostnames 2008-03-20 22:58:53 +01:00
Patrick Mezard
9672ec918b util: test fileno() availability in win32 set_binary()
Fix suggested by Alexander Belchenko <bialix@ukr.net>
2008-03-20 22:41:40 +01:00
Matt Mackall
cbb0bb78a6 tests: fix repeatability for test-filebranch with dirstate granularity 2008-03-20 15:59:54 -05:00
Matt Mackall
49e96f2d3e tests: remove some unnecessary sleeps 2008-03-20 14:14:15 -05:00
Matt Mackall
c517f4bb58 dirstate: refactor granularity code, add a test
- rename option dirstate.granularity
- move option reading into .write()
- add a simple test
2008-03-20 13:53:59 -05:00
Alexis S. L. Carvalho
d40b29d203 dirstate: ignore stat data for files that were updated too recently
This should fix the race where

  hg commit foo
  <change foo without changing its size>

happens in the same second and status is fooled into thinking foo
is clean.

A configuration item is used to determine the timeout, since different
filesystems may have different requirements (I think VFAT needs 3s,
while most Unix filesystems are fine with 1s).
2008-03-19 17:55:21 -03:00
Matt Mackall
4794cecf39 pager: remove pager code from core 2008-03-20 11:12:35 -05:00
Matt Mackall
a0ccc8000c pager: further simplify code, clean up comments 2008-03-20 11:12:35 -05:00
David Soria Parra
190db7278a Use the pager given by the environment to display long output
Unix systems usually have a PAGER environment variable set.
If it is set, mercurial will use the pager application to display
output.

Two configuration variables are available to influence the
behaviour of the pager:
  pager.application
    sets the application to be used
  pager.quiet
   silences Broken Pipe errors that might occur when the user
   quits the pager before mercurial finished to write the output
2008-03-20 00:57:14 +01:00
Christian Ebert
054ab4657a win32text: use util.binary to detect \0 2008-03-13 10:42:46 +01:00
Alexis S. L. Carvalho
d98fc139f2 merge: fix handling of deleted files 2008-03-12 15:44:08 -07:00
Bryan O'Sullivan
23adb6cef4 setup.py: os.uname is not available on Windows 2008-03-12 15:33:43 -07:00
Bryan O'Sullivan
fe8ea9f17a Automated merge with http://hg.intevation.org/mercurial/crew 2008-03-12 15:31:10 -07:00
Bryan O'Sullivan
08dc4f9063 Add inotify extension 2008-03-12 15:30:11 -07:00
Patrick Mezard
b31dc66c25 convert: rename MAPFILE into REVMAP to disambiguate with filemap 2008-03-12 23:21:01 +01:00
Thomas Arendsen Hein
61fdf43543 Add tests for the fixes to issue1014 (fractional timezones) 2008-03-12 22:20:10 +01:00
Ralf Schmitt
5cc68fbcac Make mercurial easy installable 2008-03-12 21:59:22 +01:00
Thomas Arendsen Hein
36ad657bd7 test-fetch failed due to non-zero exit code 2008-03-12 09:04:20 +01:00
Brendan Cully
a9922f5fcd Hide URL passwords in hg paths output. 2008-03-11 16:28:58 -07:00
Bryan O'Sullivan
c00f264fa3 Merge with main 2008-03-11 16:04:25 -07:00
Jonas Diemer
e984394797 Fixed bash completion for filenames containing spaces. 2008-03-11 23:54:03 +01:00
Thomas Arendsen Hein
c11614e7b8 merge with main 2008-03-11 23:59:43 +01:00
Matt Mackall
44c538327c dates: Fix bare times to be relative to "today" 2008-03-11 17:42:51 -05:00
Matt Mackall
555abf8390 dates: improve timezone handling
datestr:
- add format specifiers %1 and %2 for timezone hours and minutes
- remove timezone and timezone format options
- correctly find timezone hours and minutes for fractional and negative timezones
- update users

strdate:
- correctly find timezone hours and minutes for fractional and negative timezones
2008-03-11 17:42:41 -05:00
Matt Mackall
865487e7f2 revlog: report node and file when lookup fails 2008-03-11 17:42:29 -05:00
Matt Mackall
a62e61efb8 Merge with crew 2008-03-11 17:42:26 -05:00
Bryan O'Sullivan
f9f5e47a2f fetch: don't proceed if working directory is missing files (issue988) 2008-03-11 11:38:12 -07:00
Bryan O'Sullivan
a26a2d3c66 fetch: rename --force-editor option to --edit, for consistency 2008-03-11 11:30:42 -07:00
Matt Mackall
309ee9f391 dates: fix fractional timezone display rounding bug 2008-03-10 02:54:37 -05:00
Stephen Deasey
8fd0ead6b5 churn: show comitter email addresses unclipped (bug 1023)
Email addresses were being clipped at a hard-coded 20 chars. Measure
the length of all email addresses and accommodate the longest.
2008-03-09 17:34:55 +00:00
Brendan Cully
fd1a53bce5 gitweb: use {url} as entrypoint in notfound.tmpl instead of / 2008-03-08 17:28:25 -08:00
Brendan Cully
e1863ee903 Support web.baseurl in hgwebdir, overriding SCRIPT_NAME 2008-03-08 17:19:18 -08:00
Thomas Arendsen Hein
352ee8c7f1 Fixed typo in tag help, found by John Coomes 2008-03-08 12:40:33 +01:00
Peter Arrenbrecht
33ae436dd8 hgweb: fix test results missed by 6218:94688fe8c7c3 2008-03-07 08:38:07 +01:00
Brendan Cully
c592a63caf gitweb: remove some line breaks in archive and rss columns.
Clean up archive formatting a little in the index page.
2008-03-06 18:40:10 -08:00