Commit Graph

6315 Commits

Author SHA1 Message Date
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
Dennis Schoen
ccbd3f1b72 hgk: don't exit if mercurial commands only print warnings 2008-01-16 11:50:24 +01:00
John Coomes
7b1227d192 tag: allow multiple tags to be added or removed
- Example:  "hg tag -r 42 build-25 beta-1" will add tags build-25 and beta-1
  for rev 42.
- The deprecated and undocumented usage "hg tag arg1 arg2" used to emit a
  warning, then add tag arg1 for rev arg2 (equivalent to "hg tag -r arg2 arg1").
  It will now add tags arg1 and arg2 for the current revision.
- If one tag triggers an error, no tags are added/removed (all or nothing).
2008-03-14 15:38:56 -07:00
Giorgos Keramidas
3831b4f59e tests: update test-command-template for the new {isodatesec} filter 2008-03-17 19:28:46 +02:00
Giorgos Keramidas
54f4ca2511 Add an {isodatesec} template, to show seconds too. 2008-03-17 19:17:54 +02:00
Eric Hopper
40e06fccb8 convert: Add convert.cvsps option to set up an alternate cvsps command line. 2008-03-17 12:41:14 -07:00
Eric Hopper
63836614e1 hgwebdir: Tiny fix for webdir on non-symlink capable platforms. 2008-03-17 12:40:02 -07:00
John Mulligan
8c882ea990 Add tests for cloning from a all-history bundle 2008-03-15 12:22:15 -04:00
Matt Mackall
0dec779241 clone: use cancopy 2008-03-20 11:12:35 -05:00
John Mulligan
8bbfa5b0b7 Add ability to directly clone from all-history bundles
bundlerepos can be used as clone src, even if CWD is not a repo
2008-03-15 12:04:28 -04:00
Matt Mackall
2f4925d536 remoterepo: no longer needed
All users already use repo.local() to test for local, which is false
in the repository base class. statichttprepository never derived from
this class anyway.
2008-03-20 11:12:35 -05:00
Matt Mackall
cfa4e83bd1 repo classes: remove unused dev() method 2008-03-20 11:12:35 -05:00
John Mulligan
7a20b711a7 Add default local() and cancopy() methods to repository base class 2008-03-15 15:23:20 -04:00
Peter Arrenbrecht
8a1366afb6 make hgrc man page tell about ~/.hgrc on Windows 2008-03-07 16:19:46 +01:00
Peter Arrenbrecht
27b0107abf ui: make chuild ui feed output to parentui's active buffer 2008-03-20 11:12:35 -05:00
Matt Mackall
ab757b1627 convert: fix test complaint for mtn bits 2008-03-20 11:12:35 -05:00
Mikkel Fahnøe Jørgensen
9cd04d5249 cleanup monotone conversion and use commandline class 2008-02-03 16:14:05 +01:00
Mikkel Fahnøe Jørgensen
c3353ce9f9 initial version of monotone source for convert extension 2008-02-02 19:14:59 +01:00
Benoît Allard
5ca67f708d notify: print diffstat even if maxline == 0 2008-03-20 16:42:51 +01:00
Benoit Boissinot
19659bd6f6 Make clear that for a changegroup '-r' pulls "up to" a revision
If some better wording is found, it can be changed later.
2008-03-20 01:47:35 +01:00
Alexis S. L. Carvalho
1c6d82d6fb two fixes for the pager stuff
- open pipe in binary mode

- don't start a pager if stdout is not a tty (this prevents test-ssh
  from hanging if you set ui.usepager=True in run-tests.py)
2008-03-19 16:54:35 -03:00
David Soria Parra
fba7246b03 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. ui.pager sets the pager application. The pager is
only used if ui.usepager is true. By default ui.usepager is disabled.
2008-03-18 22:12:34 +01:00
Alexis S. L. Carvalho
d1ab1c350e Fix thinko in test-inherit-mode
If we don't change any rwx bit in the last test, hg will skip the
calls to chmod since it'll assume they're not needed.

This might fix things on BSD systems.
2008-03-18 18:14:59 -03:00
Patrick Mezard
6d9511f197 test-serve: replace copy/paste with shell function 2008-03-17 16:15:43 +01:00
Alexis S. L. Carvalho
f5a37c37de revert: update state of files in the "checkout" list
This can make a difference when there are filters involved and

    decode(encode(working-dir-data)) != working-dir-data

even though

    encode(decode(repo-data)) == repo-data

An example is a working dir file that uses only \n when you're using
the win32text extension.
2008-03-18 04:07:39 -03:00
Alexis S. L. Carvalho
dc7b734ee2 normallookup: during merges, restore the state saved by remove 2008-03-18 04:07:39 -03:00
Alexis S. L. Carvalho
cfe6940b56 dirstate.remove: during merges, remember the previous file state
We encode the previous state as a negative file size (AFAICS, previous
versions of hg always have size == 0 when state == 'r').

We save the state of 'm'erged and dirty files, because they're the
two states that indicate that a file has to be committed on a merge
to correctly record per-file history.
2008-03-18 04:07:39 -03:00
Alexis S. L. Carvalho
21fa54fe2f debugstate: add --nodates
This can be useful for tests.
2008-03-18 04:07:39 -03:00
Patrick Mezard
d65e9c81dd patch: fix corner case with update + copy patch handling (issue 937)
The self patching of files when diffed with a backup is a bit peculiar to me.
It makes sense in mpatch, that's less clear in mercurial patching code. Let's
document and preserve it for now.
2008-03-17 23:36:45 +01:00
Bryan O'Sullivan
cfc41be3f4 Merge 2008-03-17 14:51:41 -07:00
Bryan O'Sullivan
fb05f84647 Backed out changeset 8e55f27bfd09 2008-03-17 14:51:36 -07:00
Bryan O'Sullivan
00506e8d35 Merge 2008-03-17 08:04:09 -07:00
Bryan O'Sullivan
c8df1b6291 Backed out changeset 4e8e30ea7dc0 2008-03-17 07:59:23 -07:00
Bryan O'Sullivan
0b67a6539d Automated merge with http://hg.intevation.org/mercurial/crew 2008-03-16 22:59:31 -07:00
Bryan O'Sullivan
f223e2332b issue 1003: send all data properly 2008-03-16 22:59:04 -07:00
Thomas Arendsen Hein
001fa46aa0 Remove unneeded "import os.path" again. 2008-03-16 23:30:47 +01:00
Thomas Arendsen Hein
8064adc9b8 Spacing cleanup 2008-03-16 23:24:53 +01:00
Alexis S. L. Carvalho
dd492604df filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
_repopath may be different from _path for workingfilectx when there
are renames involved.
2008-03-16 06:10:47 -03:00
Eric Hopper
fd0d9f6f68 Change User-agent field in client to have a lot more info. 2008-03-15 12:42:41 -07:00
Eric Hopper
0a50218866 Allow hgwebdir collections to follow symlinks. 2008-03-15 12:42:34 -07:00
Alexis S. L. Carvalho
03368f5190 Revert 854bf5451519, fixing the output of 2 tests 2008-03-15 22:03:18 -03:00
Alexis S. L. Carvalho
dd2922fa95 test-mv-cp-st-diff: avoid linkrev collisions
The copy detection code relies heavily on the linkrevs, so it's better
to avoid collisions in this test.
2008-03-15 22:03:18 -03:00
Patrick Mezard
f51cfe018c convert: avoid querying log of foreign svn branches
Server configuration may prevent access to other branches, so don't even try to
get them, instead of ignoring them afterwards.
2008-03-16 00:35:14 +01:00