Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add diff commands #76

Draft
wants to merge 63 commits into
base: master
Choose a base branch
from
Draft

Add diff commands #76

wants to merge 63 commits into from

Conversation

douglaswth
Copy link
Contributor

@douglaswth douglaswth commented Mar 14, 2020 •
edited
Loading

When ready this will fix #59.

TODO:

  • RightScript diff
  • ServerTemplate diff
  • figure out timezone issue in Travis CI macOS and Windows builds (probably need to use ParseInLocation in rsc cm15.RubyTime)
  • check if revision field comes through in non-published/reference MCI download
  • MCI diff in ServerTemplate diff
  • support local as diff version to diff with files on disk

douglaswth and others added 30 commits March 13, 2020 11:42
@douglaswth
Add unimplemented diff subcommands
b1615ce
@douglaswth
Further implement the unimplemented diff subcommands
dd03141
@douglaswth
Add function to get RightScript revision HREFs
ad49e07
@douglaswth
Add function to get ServerTemplate revision HREFs
5d29068
@douglaswth
Add comments for revision functions
5235243
@douglaswth
Implement link only diffs
d2e7cd7
@douglaswth
Stub out some diff functions
23f738e
@douglaswth
Get started on a useful file diff function
cd1dc9e
@douglaswth
Remove unused time import
ca3734e
@douglaswth
Diff binary files and add tests
8d4543e
@douglaswth
Use Travis CI for Windows builds!
75f809f
@douglaswth
Install Mercurial on Windows Travis build
000d4a8
@douglaswth
Fix the Linux mercurial workaround so that it actually really fully o…
d726162 
…nly triggers on Linux
@douglaswth
Add -y option for choco install of Mercurial
e24cc1d
@douglaswth
Use positive if statements instead and try to install Mercurial witho…
b4a0eb5 
…ut using Chocolatey to workaround a Travis CI bug
@douglaswth
Maybe quiet wget will work?
06e3bb8
@douglaswth
Set back to using choco install hg since the Windows Travis build doe…
d51a37b 
…s not even work anyway
@douglaswth
Check if there is pip
9be5b2f
@douglaswth
Allow the Windows Travis build to fail for now
ed7eb08
@douglaswth
Add more methods to cache
2f824e2
@douglaswth
Add some tests for Cache stuff
e7f7dd6
@douglaswth
Add put cache methods
4680042
@douglaswth
Add missing error checking and defer closes found due to Windows test…
7c10765 
…s failing
@douglaswth
Add ChangeLog entry
1d7beb0
@douglaswth
Add get cache methods
1dd14bb
@douglaswth
Update contributors
cbb8634
@douglaswth
Make st and rightscript commands match better by making aliases serve…
bd5499a 
…rtemplate and rs
@douglaswth
Finish up tests for get cache methods
3c12eb1
@douglaswth
Make invalid cache item cleanup work correctly on Windows
5797403
@douglaswth
Fix up test Go code style
d10874c
douglaswth and others added 30 commits March 13, 2020 11:44
@douglaswth
Revert "Check macOS Travis CI build failure"
aa970d0 
This reverts commit c1b5ec6.
@douglaswth
A working RightScript diff!
705f098
@douglaswth
Remove extra " \n" workaround since it can have false positives
9c47937
@douglaswth
Add versioning to the cache format
8fc0ab2
@douglaswth
Fix LICENSE link
3bb0160
@douglaswth
Show committed revisions and other locator improvements
cb5de20
@douglaswth
Mercurial is still required for Windows Travis CI build, not that it …
f318813 
…will actually work though
@douglaswth
Add ChangeLog entry for commit revision and HREF
8e8e454
@douglaswth
Do not output downloading messages for RightScript diff
471e40f
@douglaswth
Add an option to diff a RightScript with null so that ServerTemplate …
afc8c9b 
…diffs will be nicer
@douglaswth
Make commit check diff before actually committing and add force option
1676129
@douglaswth
Fix go fmt
a772431
@douglaswth
Add mercurial to the path on Windows Travis CI
8d8a240
@douglaswth
Check the path on Travis CI Windows
ad067ea
@douglaswth
Add mercurial to the path on Windows Travis CI for real
f1e8264
@douglaswth
Travis CI Windows build works correctly now
5188845
@douglaswth
Use Mercurial (hg) 5.0 since 5.0.2 does not work correctly on Windows
78892d7
@douglaswth
Revert "Use Mercurial (hg) 5.0 since 5.0.2 does not work correctly on…
76ebaf1 
… Windows"

This reverts commit e376baf.
@douglaswth
Progress on ServerTemplate diff
3580d07
@douglaswth
Implement more of ServerTemplate diff
375cbd7
@douglaswth
Maybe this will work correctly on Travis CI
bfd535e
@douglaswth
Maybe this will work instead; also upgrade to Go 1.14.x
28f6fbb
@douglaswth
Remove AppVeyor in favor of Windows on Travis CI
b3a7eaf
@douglaswth
Maybe that behavior only happens on Linux?
9c80bf3
@douglaswth
Use rsc which uses time.ParseInLocation with time.UTC so tests might …
553627a 
…be more predictable
@douglaswth
Run gofmt -d to see what is going on with the Windows PR build
0dfffe9
@douglaswth
Run file *.go to see whether they are CRLF or LF
ff4a981
@douglaswth
Set git.autocrlf for Travis CI to see if that fixes it
68391b4
@douglaswth
Remove file *.go now that Travis CI works correctly again
4c9e71a
@douglaswth
Improve writing MCIs to YAML by splitting marshalling differently for…
5a9f567 
… the 4 documented definition combinations
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Add support for diffing ServerTemplates, RightScripts, and MCIs
1 participant
@douglaswth