2589 Commits

Author SHA1 Message Date
Philippe Miossec 9604fd04da chore: updating dependencies
* structuremap 2.6.4.1
2024-05-17 14:04:36 +02:00
dh2i-sam 16fa7a3c72 Fix handling of renamed branches for clone/fetch (#1493)
* In GitTfsRemote.FetchWithMerge(), apply special handling to initial
branch commits that are renaming, as rename destinations will have
these.
In GitTfsRemote.InitTfsRemoteOfChangeset(), when iterating over branch
ancestry, call InitBranch() on the ancestor branch, not the target
branch.  Also only request fetching of parents for the most distant
ancestor.  Also when handling renamed branches, assign the renameResult
for successors.
In GitTfsRemote.InitTfsBranch(), pull the initial commit hash out of
renameResult, if provided.

---------

Co-authored-by: Philippe Miossec <pmiossec@gmail.com>
2024-05-03 09:32:53 +02:00
Philippe Miossec 98648bf895 chore: remove deprecated code formatter task 2024-04-05 15:04:21 +02:00
Philippe Miossec 193b9cf5d3 Update libgit2sharp to v0.30 2024-04-05 14:48:43 +02:00
Philippe Miossec c15705acaa test: update to xunit 2.7
required adaptation: https://github.com/xunit/xunit/issues/2744
2024-04-05 14:28:32 +02:00
Philippe Miossec a0838b0390 Revert "chore: Downgrade (again) Cake.Git preventing doing a release"
This reverts commit ed1cd09033

because that was not the cause of the problem
2024-04-05 13:27:53 +02:00
Philippe Miossec e1941749e1 chore: target .net v4.8
because it is here to stay for a long time (and runtime is provided by windows update on win >=10)
2024-04-05 13:26:05 +02:00
Philippe Miossec 614676a98e chore: remove unnecessary usings
now that using <ImplicitUsings>
2024-04-05 13:09:22 +02:00
Philippe Miossec 6e39ab3277 build: use a Directory.Build.props file 2024-04-05 13:09:22 +02:00
Marian Dolinský be035b0e8f Fix typo and formatting 2024-04-05 10:56:35 +02:00
Marian Dolinský 32b187f2f3 fix: Fix handling description file into bare repo 2024-04-05 10:55:46 +02:00
Marian Dolinský 3d788906ff chore(build.ps1): cleanup
* Remove not-existent variable reference
* Remove unused parameters
2024-04-05 10:54:56 +02:00
Git-tfs release bot 0ade34ecb1 Prepare release v0.34 v0.34 v0.34.0 2024-04-04 16:55:03 +00:00
Philippe Miossec ed1cd09033 chore: Downgrade (again) Cake.Git preventing doing a release
with error: "too many redirects or authentication replays"
2024-04-04 18:41:21 +02:00
Philippe Miossec 538950c311 chore: Downgrade Cake.Git preventing doing a release
due to a bug in LibGit2Sharp
Details https://github.com/cake-contrib/Cake_Git/issues/151#issuecomment-906157528
2024-04-04 17:59:34 +02:00
Philippe Miossec 738a165cbf Merge pull request #1486 from pmiossec/update_ci_dependencies
chore: Update ci dependencies
2024-04-04 17:34:43 +02:00
Philippe Miossec 6325fd206e build: run dotnet restore
to avoid error:
error NETSDK1004: Assets file 'src\GitTfs.Vs2015\obj\project.assets.json' not found. Run a NuGet package restore to generate this file.
2024-04-04 17:23:47 +02:00
Philippe Miossec a20f0aef97 build: fix cake parameters syntax 2024-04-04 17:23:47 +02:00
Philippe Miossec 40f37ea2fe build: remove AppVeyor parameters not needed
and that makes the build fail
2024-04-04 17:23:47 +02:00
Philippe Miossec 32f95ed9f9 build: fix AppVeyor parameters syntax 2024-04-04 17:23:46 +02:00
Philippe Miossec a19c29dc42 chore: update AppVeyor image used 2024-04-04 17:23:46 +02:00
Philippe Miossec 7b5b300028 fix: fix build using ./build.ps1
because it was using an old version of msbuild by default
(required cake update to v1.3.0 for VS2022 support https://cakebuild.net/blog/2021/10/cake-v1.3.0-released )
2024-04-04 17:23:46 +02:00
Philippe Miossec 68d9c760bd chore: update cake to the last compatible version
to be able to specify the `MSBuildToolVersion.VS2022`
as the msbuild version to use (i.e v17)
otherwise the old v4 was used by default
and was not able to build the project
2024-04-04 17:23:46 +02:00
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