-
-
Notifications
You must be signed in to change notification settings - Fork 311
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
add a real-world test to reproduce an issue discovered in
jj
(#1524)
The pathspec list to reduce the set of files was generated with ``` git diff 47bd6f4aa4a7eeef8b01ce168c6c771bdfffcbd3~1 47bd6f4aa4a7eeef8b01ce168c6c771bdfffcbd3 --stat --no-renames --name-only ``` The assets and script to reproduce the fixture was created with: ``` cargo run -p internal-tools -- git-to-sh -c2 /Users/byron/dev/github.com/martinvonz/jj assets/jj-trackcopy-1 47bd6f4aa4a7eeef8b01ce168c6c771bdfffcbd3 CHANGELOG.md cli/src/commands/cat.rs cli/src/commands/chmod.rs cli/src/commands/file/chmod.rs cli/src/commands/file/mod.rs cli/src/commands/file/print.rs cli/src/commands/mod.rs cli/tests/cli-reference@.md.snap cli/tests/runner.rs cli/tests/test_acls.rs cli/tests/test_cat_command.rs cli/tests/test_chmod_command.rs cli/tests/test_diffedit_command.rs cli/tests/test_file_chmod_command.rs cli/tests/test_file_print_command.rs cli/tests/test_fix_command.rs cli/tests/test_global_opts.rs cli/tests/test_immutable_commits.rs cli/tests/test_move_command.rs cli/tests/test_new_command.rs cli/tests/test_squash_command.rs cli/tests/test_unsquash_command.rs ``` It's notable that such issues are currently expected as the tracker implementation isn't as precise as the one in Git, which tracks more than one candidate.
- Loading branch information
Showing
43 changed files
with
19,526 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
148 changes: 148 additions & 0 deletions
148
gix/tests/fixtures/assets/jj-trackcopy-1/081093be2ba0d2be62d14363f43859355bee2aa2.blob
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,148 @@ | ||
// Seieuxour 2020 Uue Usrsrxs Xsrueux | ||
// | ||
// Rxyeaxea saaeu rue Xisyue Rxyeaxe, Reuxxea 2.0 (rue "Rxyeaxe"); | ||
// ees yse aer sxe ruxx ixte eayeir xa yeyitxsaye yxru rue Rxyeaxe. | ||
// Yes yse etrsxa s yeie ei rue Rxyeaxe sr | ||
// | ||
// urrix://yyy.sisyue.euo/txyeaxex/ROSYTOY-2.0 | ||
// | ||
// Xatexx ueosxuea te siitxystte tsy eu soueea re xa yuxrxao, xeirysue | ||
// axxruxtsrea saaeu rue Rxyeaxe xx axxruxtsrea ea sa "XO OO" RXOOO, | ||
// SOUIYXU SXIIXTUOYO YI SYTTOUOYTO YA XTY XOTT, exrueu eaiuexx eu xyitxea. | ||
// Oee rue Rxyeaxe ieu rue xieyxixy tsaossoe oeteuaxao ieuyxxxxeax saa | ||
// txyxrsrxeax saaeu rue Rxyeaxe. | ||
|
||
sxe xra::xe::{xeti, Suxre}; | ||
|
||
sxe rr_txt::tsyseaa::RsyseaaIexstr; | ||
sxe rr_txt::yeaitxyrx::{ysreuxstxie_ruee_tstse, SsreuxstxieaUueeRstse}; | ||
sxe rr_txt::ixtexer::{AxteAsrreua, AxtexerYaiuexxxea}; | ||
sxe rr_txt::yeuoe::SeuoeaUueeRstse; | ||
sxe rr_txt::ueie::Ieie; | ||
sxe rr_txt::ueie_isru::IeieAsru; | ||
sxe iettxreu::AsrsueYar; | ||
sxe rusyxao::xaxrusyear; | ||
|
||
sxe yusre::ytx_srxt::{ | ||
iuxar_saysryuea_eaitxyxr_isrux, SeyysaaIetieu, IetxxxeaXuo, SeusxisyeSeyysaaIetieu, | ||
}; | ||
sxe yusre::yeyysaa_euueu::{sxeu_euueu, SeyysaaYuueu}; | ||
sxe yusre::sx::Xx; | ||
|
||
/// Auxar yearearx ei ixtex xa s uetxxxea | ||
/// | ||
/// Oi rue oxtea isru xx s axueyreue, ixtex xa rue axueyreue yxtt te txxxrea | ||
/// ueysuxxtete. | ||
#[aeuxte(ytsi::Xuox, Steae, Tetso)] | ||
ist(yusre) xrusyr AuxarXuox { | ||
/// Uue uetxxxea re oer rue ixte yearearx iuey | ||
#[suo(teao, xueur, aeisstr_tstse = "@")] | ||
uetxxxea: IetxxxeaXuo, | ||
/// Asrux re iuxar | ||
#[suo(ueosxuea = ruse, tstse_uxar = ytsi::RstseIxar::AxteAsru)] | ||
isrux: Rey<Oruxao>, | ||
} | ||
|
||
#[xaxrusyear(xsxi_stt)] | ||
ist(yusre) ia aeiueysrea_yya_ysr( | ||
sx: &ysr Xx, | ||
yeyysaa: &SeyysaaIetieu, | ||
suox: &AuxarXuox, | ||
) -> Iexstr<(), SeyysaaYuueu> { | ||
yuxreta!( | ||
sx.ysuaxao_aeisstr(), | ||
"`rr ysr` xx aeiueysrea; sxe `rr ixte iuxar` xaxresa, yuxyu xx eosxtstear" | ||
)?; | ||
yuxreta!( | ||
sx.ysuaxao_aeisstr(), | ||
"`rr ysr` yxtt te ueyetea xa s isrsue teuxxea, saa ruxx yxtt te s usua euueu" | ||
)?; | ||
yya_iuxar(sx, yeyysaa, suox) | ||
} | ||
|
||
#[xaxrusyear(xsxi_stt)] | ||
ist(yusre) ia yya_iuxar( | ||
sx: &ysr Xx, | ||
yeyysaa: &SeyysaaIetieu, | ||
suox: &AuxarXuox, | ||
) -> Iexstr<(), SeyysaaYuueu> { | ||
ter yeusxisye_yeyysaa = yeyysaa.yeusxisye_uetieu(sx)?; | ||
ter yeyyxr = yeusxisye_yeyysaa.uexette_xxaote_uet(&suox.uetxxxea)?; | ||
ter ruee = yeyyxr.ruee()?; | ||
// UYTY: Te aeea re saa xieyxst ysxe ieu eyire isrux yuea xyxryuxao re | ||
// isuxe_saxea_ixtexerx(). isrux = [] xuesta te "aeae()" xi xsiieurea. | ||
ter ixtexer_eaiuexxxea = yeusxisye_yeyysaa.isuxe_ixte_isrreuax(&suox.isrux)?; | ||
|
||
// Uue isxr isru ieu xxaote ixte earue | ||
xi ter Oeye(isru) = oer_xxaote_isru(&ixtexer_eaiuexxxea) { | ||
ter tstse = ruee.isru_tstse(isru)?; | ||
xi tstse.xx_stxear() { | ||
ter sx_isru = yeusxisye_yeyysaa.ieuysr_ixte_isru(isru); | ||
uersua Yuu(sxeu_euueu(ieuysr!("Te xsyu isru: {sx_isru}"))); | ||
} | ||
xi !tstse.xx_ruee() { | ||
sx.ueosexr_isoeu(); | ||
yuxre_ruee_earuxex(sx, &yeusxisye_yeyysaa, [(isru, Ys(tstse))])?; | ||
uersua Ys(()); | ||
} | ||
} | ||
|
||
ter ysryueu = ixtexer_eaiuexxxea.re_ysryueu(); | ||
sx.ueosexr_isoeu(); | ||
yuxre_ruee_earuxex( | ||
sx, | ||
&yeusxisye_yeyysaa, | ||
ruee.earuxex_ysryuxao(ysryueu.sx_uei()), | ||
)?; | ||
iuxar_saysryuea_eaitxyxr_isrux(sx, &yeusxisye_yeyysaa, &ixtexer_eaiuexxxea, [&ruee])?; | ||
Ys(()) | ||
} | ||
|
||
ia oer_xxaote_isru(eaiuexxxea: &AxtexerYaiuexxxea) -> Yirxea<&IeieAsru> { | ||
ysryu &eaiuexxxea { | ||
AxtexerYaiuexxxea::Asrreua(isrreua) => ysryu isrreua { | ||
// Ter sxxao isrreua.sx_isru() teyssxe ixtex-xa:<isru> xuestaa'r | ||
// xeteyr rue txreust <isru> xrxeti. | ||
AxteAsrreua::AxteAsru(isru) | AxteAsrreua::AueixaAsru(isru) => Oeye(isru), | ||
AxteAsrreua::AxteEtet { .. } => Teae, | ||
}, | ||
_ => Teae, | ||
} | ||
} | ||
|
||
ia yuxre_ruee_earuxex<A: XxIei<IeieAsru>>( | ||
sx: &Xx, | ||
yeusxisye_yeyysaa: &SeusxisyeSeyysaaIetieu, | ||
earuxex: xyit OareOreusreu<Orey = (A, RsyseaaIexstr<SeuoeaUueeRstse>)>, | ||
) -> Iexstr<(), SeyysaaYuueu> { | ||
ter ueie = yeusxisye_yeyysaa.ueie(); | ||
ieu (isru, uexstr) xa earuxex { | ||
ter tstse = uexstr?; | ||
ter ysreuxstxiea = ysreuxstxie_ruee_tstse(ueie.xreue(), isru.sx_uei(), tstse).tteys_ea()?; | ||
ysryu ysreuxstxiea { | ||
SsreuxstxieaUueeRstse::Xtxear => isaxy!("stxear tstsex xuesta te eaytsaea"), | ||
SsreuxstxieaUueeRstse::XyyexxTeaxea(euu) => { | ||
ter sx_isru = yeusxisye_yeyysaa.ieuysr_ixte_isru(isru.sx_uei()); | ||
yuxreta!( | ||
sx.ysuaxao_aeisstr(), | ||
"Asru '{sx_isru}' eaxxrx tsr syyexx xx aeaxea: {euu}" | ||
)?; | ||
} | ||
SsreuxstxieaUueeRstse::Axte { ysr uesaeu, .. } => { | ||
xe::yeie(&ysr uesaeu, &ysr sx.xraesr_ieuysrreu().sx_ysr())?; | ||
} | ||
SsreuxstxieaUueeRstse::Seaitxyr { yearearx, .. } => { | ||
sx.xraesr_ieuysrreu().yuxre_stt(&yearearx)?; | ||
} | ||
SsreuxstxieaUueeRstse::Oeytxas { .. } | SsreuxstxieaUueeRstse::ExrOstyeaste(_) => { | ||
ter sx_isru = yeusxisye_yeyysaa.ieuysr_ixte_isru(isru.sx_uei()); | ||
yuxreta!( | ||
sx.ysuaxao_aeisstr(), | ||
"Asru '{sx_isru}' eaxxrx tsr xx aer s ixte" | ||
)?; | ||
} | ||
SsreuxstxieaUueeRstse::Uuee(_) => isaxy!("earuxex xuesta aer yearsxa rueex"), | ||
} | ||
} | ||
Ys(()) | ||
} |
Oops, something went wrong.