Working great, thanks!

Ok so in my example 053efb0 is where some of the other branches have branched off (common parent). Indeed, removing some old branches improves the output.

I'm often experimenting with the code and leaving the result (spike) on a local branch. I usually call those branches spike/[name]. So ignoring all those branches would be a good start. Maybe some option to just ignore certain branches?

Additionally branches not in active use go stale. Maybe we should ignore branches without a recent commit?

When reviewing other's PRs I typically create a local tracking branch. These typically shouldn't be altered by git-stack, as they are externally owned. I don't fancy having to mark each branch as protected, as that's something that will be overlooked. So maybe we should try and determine un-owned branches by committer name, ignoring those that don't have the last commit from us.

Thanks for reporting and sorry your first experience is less than ideal! This has been my daily driver for the last several months but I've only recently started to advertise it more and so it doesn't have the polish yet of many user experiences.

Feel free to create an issue about the stackview being overwhelming. Hopefully we can find safe weighs for communicating what your workflow is like that makes it so overwhelming so we can figure out alternatives, steps, or different defaults we might want

Originally posted by @epage in https://github.com/epage/git-stack/issues/95#issuecomment-947580192

The problem description of this project seems like a perfect fit to how I'm using git. Working on multiple problems at the same time, and pull requests that build on one another. So I'm happy to try this out!

So my output from git-stack starts with this:

git stack
053efb0 Resolve lint issues
├── o
|   └── feature/eslint-typescript (pushed) Added typescript linter, but gives incorrect errors
└── o
    ├── c973df9 Corrected url
    |   ├── 297ea3e Show unsupported message to IE users
    |   |   ├── 0d5bc31 Unique cookie names for both websites

So I'm parsing this as follows:

• feature/eslint-typescript this is a stack. It's an old stack, mostly an abandoned branch last committed to 3 years ago.
• c973df9 what is this rev doing here? It is a random commit merged into master (current branch) 2 years ago.
• 297ea3e another random commit merged into master (current branch) over a year ago.

There's a lot more output, mostly revs. The output ends with a few branch names which I'm currently working on, so those make sense.

Also doesn't work:

$ git config stack.stack Descendants

$ git config stack.stack
Descendants

$git stack --dump-config - | grep stack=
	stack=All

Are you interested in a PR adding support for a Named variant, similar to IConfigureNamedOptions<T>?

https://github.com/Finbuckle/Finbuckle.MultiTenant/blob/e0c88b0a12af0152f8e404ec5bbf230341a0c0d3/src/Finbuckle.MultiTenant/Options/ITenantConfigureOptions.cs#L6 is not public, so I cannot implement it.

• [ ] I have searched the discussions
• [ ] I have searched the existing issues

Description

I'm trying to change the default --stack argument to descendants to reduce the amount of output generated by git stack. I believe this should work, but I can't seem to get it to work:

$ git config stack.stack descendants

$ git config stack.stack descendants
descendants

$ git stack --dump-config -
[stack]
...
	stack=All

Version

0.2.9

Steps to reproduce

No response

Actual Behaviour

No response

Expected Behaviour

No response

Debug Output

[TRACE git_stack::config] Initializing
[TRACE git_stack::config] Loading gitconfig
[TRACE git_stack::config] Loading /Users/bouke/Developer/XXX/.gitconfig
[TRACE git_stack::config] Loading /Users/bouke/Developer/XXX/.git/config (< this file contains the stack.stack config)

• [X] I have searched the discussions
• [X] I have searched the existing issues

Description

I'm trying out git stack on an existing git repo with lots of branches. git stack produces output, to the non-initiated a somewhat complex tree, but I assume I'll get understand that once I start using git stack. However trying git stack --pull causes a panic and asks me to report here:

git stack --pull From XXX

• branch master -> FETCH_HEAD Well, this is embarrassing.

git-stack had a problem and crashed. To help us diagnose the problem you can send us a crash report.

We have generated a report file at "/var/folders/z3/r5mpk9zx2x9g2ldj8jsxbgw80000gn/T/report-9c6ecca9-5db4-4561-9140-3e5559a8306d.toml". Submit an issue or email with the subject of "git-stack Crash Report" and include the report as an attachment.

We take privacy seriously, and do not perform any automated error collection. In order to improve the software, we rely on people to submit reports.

Thank you kindly!

With the report:

name = 'git-stack'
operating_system = 'unix:OSX'
crate_version = '0.2.9'
explanation = '''
Panic occurred in file '/Users/bouke/.cargo/registry/src/github.com-1ecc6299db9ec823/git-stack-0.2.9/src/git/repo.rs' at line 256
'''
cause = 'called `Option::unwrap()` on a `None` value'
method = 'Panic'
backtrace = '''

   0: 0x101f18ca3 - _rust_begin_unwind
   1: 0x101f671df - core::panicking::panic_fmt::h446d8c458c19157b
   2: 0x101f67137 - core::panicking::panic::h85502d0e50e703a1
   3: 0x101d11450 - core::ops::function::impls::<impl core::ops::function::FnOnce<A> for &mut F>::call_once::h9ecb1bc90fa5c413
   4: 0x101d31d2f - itertools::Itertools::join::h4b45a05693d61724
   5: 0x101d1494e - <git_stack::git::repo::GitRepo as git_stack::git::repo::Repo>::cherry_pick::hab31fb3c8eef972a
   6: 0x101d1f299 - git_stack::git::commands::Executor::stage_single::h239b0e44ccfd388e
   7: 0x101d1e61c - git_stack::git::commands::Executor::run_script::h033a775e85b41783
   8: 0x101d1e72f - git_stack::git::commands::Executor::run_script::h033a775e85b41783
   9: 0x101cd5632 - git_stack::stack::stack::h9f0791288d249293
  10: 0x101cf1a45 - git_stack::run::ha8a1ec3ceed92a08
  11: 0x101cf1519 - git_stack::main::h1da7007d8ebff9ef
  12: 0x101cfa33a - std::sys_common::backtrace::__rust_begin_short_backtrace::h1b4ffa0fc3d9cb95
  13: 0x101cfa35c - std::rt::lang_start::{{closure}}::hb98685e2ce96d9de
  14: 0x101f36c37 - std::rt::lang_start_internal::hab60970306655577
  15: 0x101cf1be9 - _main'''

Version

0.2.9

Steps to reproduce

No response

Actual Behaviour

No response

Expected Behaviour

No response

Debug Output

Skipping most of the output which seems to work fine, near the end is the following:

[TRACE git_stack::git::commands] Applying `XXX`
[TRACE git_stack::git::commands] Script: [
        SwitchMark(
            6b7f0d8c79319c342608ed1f54d5b0d316817c15,
        ),
        CherryPick(
            68406090405df0275e110e4fd581c21a4f04d7b1,
        ),
        CreateBranch(
            "XXX",
        ),
    ]
[TRACE git_stack::git::commands] git checkout 6b7f0d8c79319c342608ed1f54d5b0d316817c15  # Merged PR 2545: XXX
[TRACE git_stack::git::commands] git cherry-pick 68406090405df0275e110e4fd581c21a4f04d7b1  # XXX

The section on Add an allowedServerVariables is misleading. The example shown only works for adding a single variable, it needs an xdt:Locator directive to add additional variables:

Before:

<?xml version="1.0"?> 
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform"> 
  <system.webServer> 
    <rewrite>
      <allowedServerVariables>
        <add name="CONTENT_TYPE" xdt:Transform="InsertIfMissing" />
      </allowedServerVariables>
    </rewrite>
  </system.webServer>
</configuration>

After:

<?xml version="1.0"?> 
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform"> 
  <system.webServer> 
    <rewrite>
      <allowedServerVariables>
        <add name="CONTENT_TYPE" xdt:Transform="InsertIfMissing" xdt:Locator="Match(name)" />
      </allowedServerVariables>
    </rewrite>
  </system.webServer>
</configuration>

Various places in the SignInManager compare the userId against null. This is a problem for value types, for example Guid. I cannot use Guid? in my TUser as it needs to implement IEquatable<TKey>.

public override Guid ConvertIdFromString(string id) => Guid.Parse(id);

This returns Guid.Empty if id == null. However Guid.Empty != null and various places now assume a valid user. I see two possible fixes for this:

1. Require TKey to be a reference type: null checks can remain as-is.
2. Replace null checks with default checks: Guid.Empty == default.

Some places where using a value type is a problem:

https://github.com/aspnet/AspNetIdentity/blob/b7826741279450c58b230ece98bd04b4815beabf/src/Microsoft.AspNet.Identity.Owin/SignInManager.cs#L125 https://github.com/aspnet/AspNetIdentity/blob/b7826741279450c58b230ece98bd04b4815beabf/src/Microsoft.AspNet.Identity.Owin/SignInManager.cs#L170 https://github.com/aspnet/AspNetIdentity/blob/b7826741279450c58b230ece98bd04b4815beabf/src/Microsoft.AspNet.Identity.Owin/SignInManager.cs#L156

In order to use dependency injected services while configuring services, you'd normally inherit from IConfigureNamedOptions or IConfigureOptions and register a singleton like this:

services.AddSingleton<IConfigureOptions<CookieAuthenticationOptions>, MyConfiguration>();

Inside MyConfiguration I can have dependencies injected:

    class MyConfiguration : IConfigureOptions<CookieAuthenticationOptions>
    {
        private IDataProtectionProvider dp;

        public GatewaySessionConfiguration(IDataProtectionProvider dp)
        {
            this.dp = dp;
        }

        public void Configure(CookieAuthenticationOptions options)
        {
            options.TicketDataFormat = TicketDataFormat(dp.CreateProtector("on purpose"));
        }
    }

With the current WithPerTenantOptions<CookieAuthenticationOptions> I cannot achieve the same. The data protector is only instantiate later on in the pipeline and I cannot grab a reference to it in ConfigureServices.

Sure, the repository is here: https://github.com/Bouke/SimpleInjectorIssue928, and this is the relevant commit: https://github.com/Bouke/SimpleInjectorIssue928/commit/be4b4303364a6f5d8d09d77b9699d00eb445d7f1. Thank you.

Thank you for looking into this, I have created #928 for this.

I'm using a custom RazorPage<TModel> which I'd like to have dependencies injected into. It needs a parameterless constructor for MVC, meaning I have to use property injection.

# MyRazorPage.cs
public abstract class MyRazorPage<TModel> : RazorPage<TModel>
{
    [Import]
    public ITenantContextProvider<TenantContext> tenantProvider { get; init; }

    public TenantContext? Tenant => tenantProvider.GetContext();
}

#_ViewImports.cshtml
@inherits MyRazorPage<TModel>

I'm assuming IPropertySelectionBehavior and IComponentActivator would work here as well, but it doesn't. The property remains null. Furthermore if I use RazorInject I'm getting an exception from Microsoft DI that ITenantContextProvider<TenantContext> is not a registered service:

System.InvalidOperationException: No service for type 'ITenantContextProvider`1[TenantContext]' has been registered.
   at Microsoft.Extensions.DependencyInjection.ServiceProviderServiceExtensions.GetRequiredService(IServiceProvider provider, Type serviceType)
   at Microsoft.AspNetCore.Mvc.Razor.RazorPagePropertyActivator.<>c__DisplayClass8_0.<CreateActivateInfo>b__1(ViewContext context)
   at Microsoft.Extensions.Internal.PropertyActivator`1.Activate(Object instance, TContext context)
   at Microsoft.AspNetCore.Mvc.Razor.RazorPagePropertyActivator.Activate(Object page, ViewContext context)
   at Microsoft.AspNetCore.Mvc.Razor.RazorPageActivator.Activate(IRazorPage page, ViewContext context)

(split from https://github.com/simpleinjector/SimpleInjector/issues/860#issuecomment-937591783)

The documentation lead me to believe calling AddSimpleInjector was sufficient to perform cross-wiring. But I also need to explicitly call CrossWire for each service I want to cross-wire. This is explained in detail in the referenced article, but this one line is somewhat misleading in my humble opinion.

Hmm I think I'm just confused about the cross-wiring. AddSimpleInjector configures auto cross-wiring of framework components, and I don't have to call CrossWire myself.

The documentation lead me to believe calling AddSimpleInjector was sufficient to perform cross-wiring. But I also need to explicitly call CrossWire for each service I want to cross-wire. This is explained in detail in the referenced article, but this one line is somewhat misleading in my humble opinion.

This changes the reference to directly link to the cross-wiring page.

I'm using a custom RazorPage<TModel> which I'd like to have dependencies injected into. It needs a parameterless constructor for MVC, meaning I have to use property injection. From the context of this ticket I assumed the following would work, but it doesn't. Is this a different issue?

# MyRazorPage.cs
    public abstract class MyRazorPage<TModel> : RazorPage<TModel>
    {
        [Import]
        public ITenantContextProvider<TenantContext> tenantProvider { get; init; }

        public TenantContext? Tenant => tenantProvider.GetContext();
    }

#_ViewImports.cshtml
@inherits MyRazorPage<TModel>

I'm assuming IPropertySelectionBehavior and IComponentActivator would work here as well, but it doesn't. The property remains null. Furthermore if I use RazorInject I'm getting an exception from Microsoft DI that ITenantContextProvider<TenantContext> is not a registered service:

System.InvalidOperationException: No service for type 'ITenantContextProvider`1[TenantContext]' has been registered.
   at Microsoft.Extensions.DependencyInjection.ServiceProviderServiceExtensions.GetRequiredService(IServiceProvider provider, Type serviceType)
   at Microsoft.AspNetCore.Mvc.Razor.RazorPagePropertyActivator.<>c__DisplayClass8_0.<CreateActivateInfo>b__1(ViewContext context)
   at Microsoft.Extensions.Internal.PropertyActivator`1.Activate(Object instance, TContext context)
   at Microsoft.AspNetCore.Mvc.Razor.RazorPagePropertyActivator.Activate(Object page, ViewContext context)
   at Microsoft.AspNetCore.Mvc.Razor.RazorPageActivator.Activate(IRazorPage page, ViewContext context)

The documentation seems wrong and fixing that is no longer trivial (to me). Seems like you guys know all about this build pipeline and what the fix should be.