Skip to content
Snippets Groups Projects
  1. Feb 04, 2016
  2. Feb 08, 2016
    • Pierre-Yves David's avatar
      tests: add an explicit destination in some rebase tests · 79437fb352ce
      Pierre-Yves David authored
      As we will make 'rebase' behave more like 'merge', it will no longer pick
      'max(branch(.))' as the default destination. We have to hard code the expected
      destination is multiple tests where it matters. After a careful inspection none
      of theses tests really cares about the default destination behavior and just
      omitted one out of laziness.
      79437fb352ce
    • Pierre-Yves David's avatar
      tests: remove third head in some of the 'rebase-parameters' tests · ab382192337a
      Pierre-Yves David authored
      These tests do not care about that extra branch at all. In future changeset we
      will make rebase behave like merge and abort in case of an ambiguous destination
      (eg: multiple other heads) and that extra branch will make the command
      invocation breaks.
      
      We preventively remove this extra branch from the relevant tests in an
      independant changeset to reduce noise and increase confidence in the final
      change.
      ab382192337a
  3. Feb 01, 2016
  4. Dec 24, 2015
  5. Oct 06, 2015
  6. Sep 01, 2015
    • liscju's avatar
      rebase: fix warning about ignoring tool option on rebase continue (issue4698) · 927c0d84e09f
      liscju authored
      Before this patch rebase --continue with specified --tool option outputs
      warnings "tool option will be ignored". It is false statement because
      in case of any merge conflicts it uses specified tool to resolve it.
      
      This patch makes this warning appears only when user specified --tool
      when running rebase --abort , in this case tool doesn't have any
      sense
      927c0d84e09f
  7. May 29, 2015
    • Gilles Moris's avatar
      summary: move the parents phase marker to commit line (issue4688) · 6084926366b9
      Gilles Moris authored
      The phase of the pending commit depends on the parent of the working directory
      and on the phases.newcommit configuration.
      First, this information rather depend on the commit line which describe the
      pending commit.
      Then, we only want to be advertised when the pending phase is going to be higher
      than the default new commit phase.
      
      So the format will change from
      
      $ hg summary
      parent: 2:ab91dfabc5ad
       foo
      parent: 3:24f1031ad244 tip
       bar
      branch: default
      commit: 1 modified, 1 unknown, 1 unresolved (merge)
      update: (current)
      phases: 1 secret (secret)
      
      to
      
      parent: 2:ab91dfabc5ad
       foo
      parent: 3:24f1031ad244 tip
       bar
      branch: default
      commit: 1 modified, 1 unknown, 1 unresolved (merge) (secret)
      update: (current)
      phases: 1 secret
      6084926366b9
  8. May 14, 2015
    • Gilles Moris's avatar
      summary: add a phase line (draft, secret) to the output · 1ef96a3b8b89
      Gilles Moris authored
      The number of draft and secret changesets are currently not summarized.
      This is an important information because the number of drafts give some rough
      idea of the number of outgoing changesets in typical workflows, without needing
      to probe a remote repository. And a non-zero number of secrets means that
      those changeset will not be pushed.
      
      If the repository is "dirty" - some draft or secret changesets exists - then
      summary will display a line like:
      
      phases: X draft, Y secret (public)
      
      The phase in parenthesis corresponds to the highest phase of the parents of
      the working directory, i.e. the current phase.
      
      By default, the line is not printed if the repository is "clean" - all
      changesets are public - but if verbose is activated, it will display:
      
      phases: (public)
      
      On the other hand, nothing will be printed if quiet is in action.
      
      A few tests have been added in test-phases.t to cover the -v and -q cases.
      1ef96a3b8b89
  9. Jan 18, 2015
  10. Jan 09, 2015
    • Durham Goode's avatar
      bundles: do not overwrite existing backup bundles (BC) · aa4a1672583e
      Durham Goode authored
      Previously, a backup bundle could overwrite an existing bundle and cause user
      data loss. For instance, if you have A<-B<-C and strip B, it produces backup
      bundle B-backup.hg. If you then hg pull -r B B-backup.hg and strip it again, it
      overwrites the existing B-backup.hg and C is lost.
      
      The fix is to add a hash of all the nodes inside that bundle to the filename.
      Fixed up existing tests and added a new test in test-strip.t
      aa4a1672583e
  11. Dec 10, 2014
  12. Dec 09, 2014
  13. Dec 07, 2014
  14. Nov 10, 2014
  15. Sep 01, 2014
    • David Soria Parra's avatar
      rebase: add a deprecated -i/--interactive flag · d5b04ee8ecf7
      David Soria Parra authored
      A common mistake can be to type 'hg rebase -i' to discover interactive history
      editing. We add a -i/--interactive flag as discussed in the sprint and deprecate
      it right away, but hint people using it to use histedit instead.
      d5b04ee8ecf7
  16. Jul 26, 2014
  17. May 09, 2014
    • Matt Mackall's avatar
      resolve: simplify "finished" message · e4f451c8c05c
      Matt Mackall authored
      The recently introduced message was:
      
        no unresolved files; you may continue your unfinished operation
      
      This had three problems:
      
      - looks a bit like an error message because it's not saying "we've
        just resolved the last file"
      - refers to "unfinished operation", which won't be the case with
        "update" or "merge"
      - introduces semicolons to error messages, which is stylistically
        questionable
      
      I've simplified this to:
      
        no more unresolved files
      
      In the future, if we want to prompt someone to continue a particular operation, we should use
      a hint style:
      
        no more unresolved files
        (use 'hg graft --continue' to finish grafting)
      e4f451c8c05c
  18. Apr 19, 2014
    • Gregory Szorc's avatar
      resolve: print message when no unresolved files remain (issue4214) · 19d6fec60b81
      Gregory Szorc authored
      When using resolve, users often have to consult with the output of |hg
      resolve -l| to see if any unresolved files remain. This step is tedious
      and adds overhead to resolving.
      
      This patch will notify a user if there are no unresolved files remaining
      after executing |hg resolve|::
      
          no unresolved files; you may continue your unfinished operation
      
      The patch stops short of telling the user exactly what command should be
      executed to continue the unfinished operation. That is because this
      information is not currently captured anywhere. This would make a
      compelling follow-up feature.
      19d6fec60b81
  19. May 01, 2014
  20. Apr 23, 2014
  21. Nov 17, 2013
    • Mads Kiilerich's avatar
      rebase: improve error message for --base being empty or causing emptiness · dc5157841361
      Mads Kiilerich authored
      Before it just said 'nothing to rebase'.
      
      Now 'if "base" is an empty set:
        abort: empty "base" revision set - can't compute rebase set
      
      If the set of changesets to rebase can't be found from "base", it will fail as
      before but with more explanation of what the problem was.
      
      The name of the "base" option is not obvious - it is more like "samples
      identifying the branch to rebase". The error messages for problems with the
      specified "base" value will use that term and might thus also not be obvious,
      but at least they are consistent with the option name. The name "base" will not
      be used if the base only was specified implicitly as the working directory
      parent.
      dc5157841361
    • Mads Kiilerich's avatar
      rebase: improve error message for empty --source set · 3bff26f67169
      Mads Kiilerich authored
      Before, it just said 'nothing to rebase' in this case. Now, it aborts
      mentioning the reason: 'empty "source" revision set'.
      
      Specifying revisions that cannot be rebased is a 'soft' error, but specifying
      an empty set deserves an abort that explains exactly what the problem is.
      3bff26f67169
  22. Nov 16, 2013
    • Mads Kiilerich's avatar
      rebase: improve error message for empty --rev set · a259f7b488ab
      Mads Kiilerich authored
      Before, it just said 'nothing to rebase' in this case. Now, it aborts
      mentioning the reason: 'empty "rev" revision set'.
      
      Specifying revisions that cannot be rebased is a 'soft' error, but specifying
      an empty set deserves an abort that explains exactly what the problem is.
      a259f7b488ab
  23. Nov 17, 2013
  24. Nov 22, 2013
  25. Oct 14, 2013
    • Pierre-Yves David's avatar
      rebase: preserve working directory parent (BC) · 9c78ed396075
      Pierre-Yves David authored
      Prior to this changeset, rebase always left the working directory as a parent of
      the last rebased changeset. The is dubious when, before the rebase, the working
      directory was not a parent of the tip most rebased changeset.
      
      With this changeset, we move the working directory back to its original parent.
      If the original parent was rebased, we use it's successors.
      
      This is a step toward solving issue3813 (rebase loses active bookmark if it's
      not on a head)
      9c78ed396075
  26. May 14, 2013
  27. Feb 08, 2013
  28. Jun 20, 2012
    • Pierre-Yves David's avatar
      rebase: do not add second parent to rebased changeset (drop detach option) (BC) · 50f434510da6
      Pierre-Yves David authored
      Rebase now behaves as if --detach was always passed. Non-merges are
      rebased as non-merges, regardless of their parent being an ancestor of
      the destination. Merges will usually be rebased as merges unless both of
      their parents are ancestors of the destination, or one of their parents
      is pruned when rebased.
      
      This only alters the behavior of rebase when using the --source/--rev
      options. --detach option is deprecated.
      
      All test changes were carefully validated.
      50f434510da6
  29. Jun 10, 2012
    • kiilerix's avatar
      tests: add missing trailing 'cd ..' · f2719b387380
      kiilerix authored
      Many tests didn't change back from subdirectories at the end of the tests ...
      and they don't have to. The missing 'cd ..' could always be added when another
      test case is added to the test file.
      
      This change do that tests (99.5%) consistently end up in $TESTDIR where they
      started, thus making it simpler to extend them or move them around.
      f2719b387380
  30. May 01, 2012
  31. Apr 29, 2012
  32. Apr 03, 2012
  33. Dec 26, 2011
  34. Oct 15, 2011
    • Pierre-Yves David's avatar
      rebase: add --rev option to rebase · 6cb6064f1d50
      Pierre-Yves David authored
      This option allow a strict set of revision to be specified instead of using -s
      or -b. Rebase will refuse start if striping  rebased changeset will strip non
      rebased changeset. Rebase will refuse to work on set with multiple root.
      6cb6064f1d50
    • Pierre-Yves David's avatar
      rebase: use revset as soon as possible in internal logic · 3bfdfefea2fc
      Pierre-Yves David authored
      The buildstate function now take a set of revs. Logic related to --source and
      --base option have been moved in the main rebase function.
      
      In the process this fixes a bug where the wrong source changeset might be pick.
      This explain the changes in hgext/rebase.py
      3bfdfefea2fc
Loading