Skip to content
Snippets Groups Projects
  1. Feb 17, 2011
  2. Feb 16, 2011
  3. Feb 17, 2011
  4. Feb 16, 2011
  5. Feb 09, 2011
    • Erik Zielke's avatar
      subrepos: prompt on conflicts on update with dirty subrepos · 0748e18b
      Erik Zielke authored
      Consider a repository with a single subrepository. The changesets in
      the main repository reference the subrepository changesets like this:
      
        m0 -> s0
        m1 -> s1
        m2 -> s2
      
      Starting from a state (m1, s0), doing 'hg update m2' in the main
      repository will yield a conflict: the subrepo is at revision s0 but
      the target revision says it should be at revision s2.
      
      Before this change, Mercurial would do (m1, s0) -> (m2, s2) and thus
      ignore the conflict between the working copy and the target revision.
      
      With this change, the user is prompted to resolve the conflict by
      choosing which revision he wants. This is consistent with 'hg merge',
      which also prompts the user when it detects conflicts in the merged
      .hgsubstate files.
      
      The prompt looks like this:
      
        $ hg update tip
         subrepository sources for my-subrepo differ
        use (l)ocal source (fc627a69481f) or (r)emote source (12a213df6fa9)?
      0748e18b
  6. Feb 16, 2011
  7. Feb 09, 2011
  8. Feb 03, 2011
  9. Feb 15, 2011
  10. Dec 24, 2010
    • Dan Villiom Podlaski Christiansen's avatar
      explicitly close files · 14f3795a
      Dan Villiom Podlaski Christiansen authored
      Add missing calls to close() to many places where files are
      opened. Relying on reference counting to catch them soon-ish is not
      portable and fails in environments with a proper GC, such as PyPy.
      14f3795a
  11. Feb 11, 2011
  12. Jan 26, 2011
  13. Jan 15, 2011
    • jfh's avatar
      add debugignore which yields the combined ignore patten of the .hgignore files · 3e66eec9
      jfh authored
      For GUI clients its sometimes important to know which files will be ignored and
      which files will be important. This allows the GUI client to skipping redoing a
      'hg status' when the files are ignored but have changed. (For instance, a
      typical case is that the "build" directory inside some project is ignored but
      files in it frequently change.)
      3e66eec9
  14. Feb 04, 2011
    • Gastón Kleiman's avatar
      diffstat: fix parsing of filenames with spaces · 104c9ed9
      Gastón Kleiman authored
      The patch changes the output of "hg diff --stat" when one file whose filename
      has spaces has changed, making it get the full filename instead of just the
      substring between the last space and the end of the filename.
      
      It also changes the diffstat generated by "hg email -d" when one of the commit
      messages starts with "diff". Because of the regex used to parse the filename,
      the diffstat generated by "hg email -d" will still be not correct if a commit
      message starts with "diff -r ".
      
      Before the patch Mercurial has the following behavior:
      
      $ echo "foobar">"file with spaces"
      $ hg add "file with spaces"
      $ hg diff --stat
       spaces |  1 +
       1 files changed, 1 insertions(+), 0 deletions(-)
      $ hg diff --git --stat
       file with spaces |  1 +
       1 files changed, 1 insertions(+), 0 deletions(-)
      
      After the patch:
      
      $ echo "foobar">"file with spaces"
      $ hg add "file with spaces"
      $ hg diff --stat
       file with spaces |  1 +
       1 files changed, 1 insertions(+), 0 deletions(-)
      $ hg diff --git --stat
       file with spaces |  1 +
       1 files changed, 1 insertions(+), 0 deletions(-)
      
      Before the patch:
      
      $ hg add mercurial/patch.py tests/tests-diffstat.t
      $ hg commit -m "diffstat: fix parsing of filenames"
      
      $ hg email -d --test tip
      This patch series consists of 1 patches.
      
      diffstat: fix parsing of filenames
      [...]
      
       filenames             |    0
       mercurial/patch.py    |    6 ++++--
       tests/test-diffstat.t |   17 +++++++++++++++++
       3 files changed, 21 insertions(+), 2 deletions(-)
      [...]
      
      After the patch:
      
      $ hg email -d --test tip
      This patch series consists of 1 patches.
      
      diffstat: fix parsing of filenames
      
      [...]
      
       mercurial/patch.py    |    6 ++++--
       tests/test-diffstat.t |   17 +++++++++++++++++
       3 files changed, 21 insertions(+), 2 deletions(-)
      [...]
      104c9ed9
Loading