1. 22 Dec, 2017 1 commit
    • Luke Diamand's avatar
      git-p4: update multiple shelved change lists · 8cf422db
      Luke Diamand authored
      --update-shelve can now be specified multiple times on the
      command-line, to update multiple shelved changelists in a single
      This then means that a git patch series can be mirrored to a
      sequence of shelved changelists, and (relatively easily) kept in
      sync as changes are made in git.
      Note that Perforce does not really support overlapping shelved
      changelists where one change touches the files modified by
      another. Trying to do this will result in merge conflicts.
      Signed-off-by: Luke Diamand's avatarLuke Diamand <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
  2. 23 Aug, 2017 1 commit
  3. 13 Jul, 2017 2 commits
  4. 17 Apr, 2017 2 commits
  5. 10 Feb, 2017 1 commit
  6. 30 Jan, 2017 1 commit
    • George Vanburgh's avatar
      git-p4: fix git-p4.mapUser on Windows · c3c2b057
      George Vanburgh authored
      When running git-p4 on Windows, with multiple git-p4.mapUser entries in
      git config - no user mappings are applied to the generated repository.
      Reproduction Steps:
      1. Add multiple git-p4.mapUser entries to git config on a Windows
      2. Attempt to clone a p4 repository
      None of the user mappings will be applied.
      This issue is actually caused by gitConfigList, using split(os.linesep)
      to convert the output of git config --get-all into a list. On Windows,
      os.linesep is equal to '\r\n' - however git.exe returns configuration
      with a line seperator of '\n'.
      This leads to the list returned by gitConfigList containing only one
      element - which contains the full output of git config --get-all in
      string form, which causes problems for the code introduced to
      getUserMapFromPerforceServer in 10d08a14 ("git-p4: map a P4 user to
      Git author name and email address", 2016-03-01)
      This issue should be caught by the test introduced in 10d08a14, however
      would require running on Windows to reproduce.
      Using splitlines solves this issue, by splitting config on all
      typical delimiters ('\n', '\r\n' etc.)
      Signed-off-by: default avatarGeorge Vanburgh <[email protected]>
      Reviewed-by: Luke Diamand's avatarLuke Diamand <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
  7. 29 Dec, 2016 1 commit
  8. 20 Dec, 2016 1 commit
  9. 19 Dec, 2016 1 commit
    • George Vanburgh's avatar
      git-p4: fix multi-path changelist empty commits · 9943e5b9
      George Vanburgh authored
      When importing from multiple perforce paths - we may attempt to
      import a changelist that contains files from two (or more) of these
      depot paths. Currently, this results in multiple git commits - one
      containing the changes, and the other(s) as empty commit(s). This
      behavior was introduced in commit 1f90a648 ("git-p4: reduce number
      of server queries for fetches", 2015-12-19).
      Reproduction Steps:
        1. Have a git repo cloned from a perforce repo using multiple
           depot paths (e.g. //depot/foo and //depot/bar).
        2. Submit a single change to the perforce repo that makes changes
           in both //depot/foo and //depot/bar.
        3. Run "git p4 sync" to sync the change from #2.
      Change is synced as multiple commits, one for each depot path that
      was affected.
      Using a set, instead of a list inside p4ChangesForPaths() ensures
      that each changelist is unique to the returned list, and therefore
      only a single commit is generated for each changelist.
      Reported-by: default avatarJames Farwell <[email protected]>
      Signed-off-by: default avatarGeorge Vanburgh <[email protected]>
      Reviewed-by: Luke Diamand's avatarLuke Diamand <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
  10. 18 Dec, 2016 1 commit
  11. 14 Dec, 2016 1 commit
  12. 05 Dec, 2016 3 commits
  13. 29 Nov, 2016 1 commit
  14. 11 Aug, 2016 1 commit
    • Ville Skyttä's avatar
      Spelling fixes · 2e3a16b2
      Ville Skyttä authored
          <BAD>                     <CORRECTED>
          accidently                accidentally
          commited                  committed
          dependancy                dependency
          emtpy                     empty
          existance                 existence
          explicitely               explicitly
          git-upload-achive         git-upload-archive
          hierachy                  hierarchy
          indegee                   indegree
          intial                    initial
          mulitple                  multiple
          non-existant              non-existent
          precendence.              precedence.
          priviledged               privileged
          programatically           programmatically
          psuedo-binary             pseudo-binary
          soemwhere                 somewhere
          successfull               successful
          transfering               transferring
          uncommited                uncommitted
          unkown                    unknown
          usefull                   useful
          writting                  writing
      Signed-off-by: Ville Skyttä's avatarVille Skyttä <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
  15. 08 Jul, 2016 1 commit
  16. 22 Jun, 2016 1 commit
  17. 28 Apr, 2016 1 commit
  18. 19 Apr, 2016 1 commit
    • Jan Durovec's avatar
      git-p4: add P4 jobs to git commit message · 26e6a27d
      Jan Durovec authored
      When migrating from Perforce to git the information about P4 jobs
      associated with P4 changelists is lost.
      Having these jobs listed on messages of related git commits enables smooth
      migration for projects that take advantage of e.g. JIRA integration
      (which uses jobs on Perforce side and parses commit messages on git side).
      The jobs are added to the message in the same format as is expected when
      migrating in the reverse direction.
      Signed-off-by: default avatarJan Durovec <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
  19. 15 Mar, 2016 1 commit
  20. 13 Jan, 2016 1 commit
  21. 21 Dec, 2015 2 commits
  22. 10 Dec, 2015 1 commit
  23. 24 Nov, 2015 3 commits
  24. 20 Oct, 2015 1 commit
  25. 03 Oct, 2015 7 commits
  26. 22 Sep, 2015 1 commit
  27. 21 Sep, 2015 1 commit