Commit Graph

2566 Commits

Author SHA1 Message Date
Philippe Miossec 7f46bb3d0a chore: update to last paket version 2024-04-04 17:14:41 +02:00
Philippe Miossec 6f2c84ef91 chore: changelog 2024-04-04 17:07:23 +02:00
Philippe Miossec 3d49f26005 refactor: convert to interpolated strings 2024-04-04 17:07:23 +02:00
Philippe Miossec 4d665823b0 refactor: clean namespaces 2024-04-04 17:07:23 +02:00
Philippe Miossec 076a9de035 refactor: convert to use Expression Bodies 2024-04-04 17:07:23 +02:00
Philippe Miossec 414f985981 refactor(Wrappers): convert to use Expression Bodies 2024-04-04 15:47:56 +02:00
Philippe Miossec 62a9a38cf2 fix(Verify): fix crash when unwrapping something already unwrapped
* use unwarpped _item because we already have it
* add a check in case it happen again to return already unwrapped item

Fixes #1483
2024-04-04 15:47:56 +02:00
Philippe Miossec ac9e3c94e0 fix: build VS2022 support 2024-03-07 19:50:15 +01:00
Philippe Miossec ee53a063dd ci(chocolatey): fix requirement of a sha256 hash 2024-03-04 10:16:40 +01:00
Philippe Miossec de4cb6bc21 ci: workaround cake/chocolatey bug preventing submission 2024-03-01 19:17:19 +01:00
Git-tfs release bot c719f7095e Prepare release v0.33 v0.33 v0.33.0 2024-03-01 17:38:41 +00:00
Philippe Miossec 1381deae26 ci: Improve error handling reading 'PersonalTokens.config' content
+ support for new GitHub PAT format
2024-03-01 18:34:07 +01:00
Philippe Miossec bee1da212d docs: slightly better release doc 2024-03-01 17:58:24 +01:00
ryancdotnet 74aaf6ca3f Enabling PAT authentication support (#1476)
thanks to a `GIT_TFS_PAT` environment variable

---------

Co-authored-by: Philippe Miossec <pmiossec@gmail.com>
2024-03-01 16:54:10 +01:00
Brandon Trumble 76e63a1ed8 Cloning a very old repo (10+ years old) and I kept getting object ref errors. Upon debugging, it looks like GetMergeInfo is failing because some merges have null source changesets. I'm making an educated guess that they were from branches that were deleted? Either way, adding a .Where(x => x.SourceChangeset?.ChangesetId != null) allows it to get past the issue and continue the clone 2024-03-01 16:53:14 +01:00
Marco b7cbac3b09 Fixed rare issue when a TFS changeset was made on different branches
Warn the user if a TFS changeset shall be assigned to multiple commits.

Closes #1469
2023-09-25 14:23:38 +02:00
Peter Baumann 36be5582a6 Merge pull request #1456 from mhamdan91/patch-1
Expand cloning command in README
2023-02-24 08:53:28 +01:00
Muhammad Hamdan a6f114edee Update README.md
Without explicitly providing the destination folder, the contents of repo fields to be cloned properly.
I am not sure if anyone else encountered this, but I did and this was the solution to it.

I have not looked at your src and what you do in case of not providing a destination folder, but if you think this is a valid proposal, feel free to merge
2023-02-23 14:59:40 -08:00
Peter Baumann 5fa9b57472 Merge pull request #1448 from idealist1508/LogConflicts
Show the actual conflicting file(s) when there are conflicts when doing git-tfs pull
2023-01-10 11:34:00 +01:00
none f4e8f55c80 Updated NEXT.md 2023-01-06 12:26:50 +01:00
none 9529d78918 Added logging of conflicts for merge operation 2023-01-06 12:06:33 +01:00
Peter Baumann 5a010df682 Remove --no-metadata from documentation
The feature is gone since v0.17.0 and was removed in
4c2ab71e ("Remove unused config no-meta-data (see #281, #283).", 2013-01-10)

Remove the leftover comments to avoid any further confusion.
Note: For removing the `git-tfs-id:` markers at the end of the commit
message, see the howto at https://github.com/git-tfs/git-tfs/blob/master/doc/usecases/migrate_tfs_to_git.md#clean-commits-optional
2022-12-14 19:16:42 +01:00
Philippe Miossec b518423cd5 Doc: fix the name of the --workspace option 2022-12-06 22:52:17 +01:00
Peter Baumann d39c306eb8 Merge pull request #1436 from bbronisz/master
Fixes quick-clone authors file warning.

Fixes #1435
2022-09-27 09:17:34 +02:00
Beniamin Bronisz f2a81aad67 Fixes quick-clone authors file warning 2022-09-23 17:41:09 +02:00
Peter Baumann b1e30159be Merge pull request #1434 from siprbaum/editorconfig
Minor improvements for .editorconfig
2022-09-16 15:53:52 +02:00
Peter Baumann 0d3b6196ac .editorconfig: end markdown files always with a newline 2022-09-16 15:44:35 +02:00
Peter Baumann 60384ab76c .editorconfig: seperate import directives by space 2022-09-16 15:44:15 +02:00
Peter Baumann f5209e58b1 .editorconfig: sort system directives first 2022-09-16 15:41:53 +02:00
Peter Baumann 65fa982a47 Add #1424 and #1425 to the NEXT.md release notes
While at it, also fix the syntax to actually make the users clickable
in github by adding the missing '@'.
2022-06-15 17:37:46 +02:00
Peter Baumann 093b53e399 Merge pull request #1425 to support --delete-remotes-file=<file> option 2022-06-15 17:24:37 +02:00
Christoph Korn b6a786e2f5 Authenticate last server only once
Without this optimization the last server is authenticated for each remote. In the common case where all remotes are on the same TFS server it is only authenticated once now.
2022-06-07 08:22:56 +02:00
Christoph Korn fe263eeeee Refactor DeleteRemotesFromFile to have the logic only once
Deleting one remote is just a special case of deleting many.
So use the same main logic for both cases.
Can also fail with the list of all invalid remotes instead of just the first.
2022-06-01 21:22:04 +02:00
Christoph Korn e44aaacc3a Always favor the author from the authors file
In case the author comes from the TFS identity it was not replaced by a match in the authors file.
The authors file should always win because the identity on the TFS may be outdated. If the author should not be replaced simply do not include the mapping in the authors file.
2022-05-29 22:12:35 +02:00
Christoph Korn 3a8e65b733 Document new delete-remotes-file parameter
Adds a description about how to use the new parameter
--delete-remotes-file together with branch --delete.
2022-05-22 12:36:41 +02:00
Christoph Korn efca05de7b Use relative path for /exclude in xcopy
xcopy with /exclude to an absolute path that contains
spaces does not work.
But quotes also does not work for /exclude:
https://stackoverflow.com/a/43298176

So simply use a relative path.
2022-05-21 09:54:17 +02:00
Christoph Korn 134abb809c Read multiple remotes for deletion from file
The branch command can only delete one branch at a time.
(Except when --all is given)
Make it delete many remotes by reading them from a file.
2022-05-20 22:22:23 +02:00
Peter Baumann f094831248 Documentation: Explain MSYS_NO_PATHCONV handling for git bash in clone help 2022-03-01 18:21:38 +01:00
Peter Baumann 939470eaf4 Use authorsfiles for shelvesets and make dependency visible 2022-02-08 18:50:48 +01:00
Peter Baumann c62dfdd945 Remove setter for TfsChangeset.Summary
The setter of the Summary property is not exposed on the ITfsChangeset
interface level and during the lifetime of the TfsChangeset object, the
property Summary should not change. Therefore prefere to initalize it
once in the ctor by adding it as another parameter to make this
immutability obvious by removing the setter.
2022-02-08 18:50:48 +01:00
siprbaum c9ab4624d7 Merge pull request #1412 from fineol/bug/1409
Fix rare case seen in the wild where `git-tfs clone --gitignore=...` failed when the first changeset is a rename.

Fixes #1409
2022-02-08 17:50:13 +01:00
fineol 1697af8633 Clarify tests for issue #1409 2022-02-07 17:52:25 -05:00
fineol fb271373dc Update NEXT.md 2022-02-06 17:27:14 -05:00
fineol 434aeecfdb Fix --gitignore clone fail when first changeset is rename
Issue git-tfs/git-tfs#1409
2022-02-06 17:03:34 -05:00
siprbaum 095b653fb2 Merge pull request #1405 to support --initial-branch option
This pull request adds support for specifying the name of a new repository's initial branch
by passing along the --initial-branch=<branch> option to git-init.

Git added the the initial-branch option in version 2.28.0 on July 27, 2020. Adding this option
to git-tfs improves git-tfs' parity with newer versions of git while still allowing git-tfs to work
with older versions of git. 

Several of git-tfs' integration tests currently fail if the machine/user running the tests includes a system
or global config value for init.defaultbranch that is not "master", which were fixed in the PR, too.
The integration tests were made more self contained sol that they no longer read the global and system
configuration to decouple them from any users or systemwide configured values.
2022-02-04 08:20:29 +01:00
fineol e9a9ddcb45 Update documentation for --initial-branch option 2022-02-03 19:05:11 -05:00
Peter Baumann db59f6b715 Update paket to version 6.2.1
Since ea2b488b ("Visual Studio 2022 support", 2022-01-29) `paket  restore`
shows the following error message in red:

    target: AppVeyorBuild
    Preparing to run build script...
    paket.exe : Could not detect any platforms from 'net6.0' in System.Reflection.Metadata 6.0, please tell the package authors
    At line:1 char:1
    + &"C:\gittfs\src\paket.exe" restore
    + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
        + CategoryInfo          : NotSpecified: (Could not detec...package authors:String) [], RemoteException
        + FullyQualifiedErrorId : NativeCommandError

    Could not detect any platforms from 'net6.0' in System.Collections.Immutable 6.0, please tell the package authors
    Could not detect any platforms from 'net6.0' in System.ComponentModel.Composition 6.0, please tell the package authors
    Could not detect any platforms from 'net6.0' in System.Runtime.CompilerServices.Unsafe 6.0, please tell the package authors
    Could not detect any platforms from 'net6.0' in System.Security.AccessControl 6.0, please tell the package authors
    Could not detect any platforms from 'net6.0' in System.Diagnostics.DiagnosticSource 6.0, please tell the package authors
    Could not detect any platforms from 'net6.0' in System.IO.Pipelines 6.0.1, please tell the package authors
    Could not detect any platforms from 'net6.0' in System.Threading.AccessControl 6.0, please tell the package authors

The build seems still to be successful, as all the tests succeeded and
that is also the reason why this wasn't noticed during PR #1407.
But the large wall of text - colored in red - looks frightening.

Update paket to version 6.2.1 to fix it.
Admitingly, I couldn't find out the underlying reason why this is fixed
with a newer version of paket.
2022-02-03 22:39:23 +01:00
fineol be48e4dae5 Add test for git tfs init with --gitignore argument 2022-02-03 11:37:26 -05:00
fineol 9af69aaab1 Add HEAD ref if missing when committing .gitignore
This prevents disconnected history when subsequent commits are
added to a repo created via the unconventional, but still valid,
method of calling git-tfs init with a --gitignore argument.
2022-02-03 10:36:28 -05:00
fineol 0d3a507bcd Don't assume branch name when committing .gitignore 2022-02-03 09:39:16 -05:00